diff --git a/Pkmds.Web/Components/MainTabPages/TrainerInfoTab.razor b/Pkmds.Web/Components/MainTabPages/TrainerInfoTab.razor
index a9020cad..5e5029cc 100644
--- a/Pkmds.Web/Components/MainTabPages/TrainerInfoTab.razor
+++ b/Pkmds.Web/Components/MainTabPages/TrainerInfoTab.razor
@@ -159,8 +159,8 @@
                 <MudAutocomplete T="@ComboItem"
                                  Label="Rival Starter"
                                  Variant="@Variant.Outlined"
-                                 @bind-Value:get="@(AppService.GetSpeciesComboItem(sav1Rival.RivalStarter))"
-                                 @bind-Value:set="@(species => { sav1Rival.RivalStarter = (byte)species.Value; })"
+                                 @bind-Value:get="@GetGen1RivalStarter(sav1Rival)"
+                                 @bind-Value:set="@(species => SetGen1RivalStarter(sav1Rival, species))"
                                  SearchFunc="@SearchPokemonNames"
                                  ToStringFunc="@(species => species?.Text)" />
             </div>
diff --git a/Pkmds.Web/Components/MainTabPages/TrainerInfoTab.razor.cs b/Pkmds.Web/Components/MainTabPages/TrainerInfoTab.razor.cs
index 8e07070e..c57aeb02 100644
--- a/Pkmds.Web/Components/MainTabPages/TrainerInfoTab.razor.cs
+++ b/Pkmds.Web/Components/MainTabPages/TrainerInfoTab.razor.cs
@@ -202,4 +202,16 @@ private void UpdateHallOfFame()
                 return;
         };
     }
+
+    private ComboItem GetGen1RivalStarter(SAV1 sav1)
+    {
+        var nationalSpeciesId = SpeciesConverter.GetNational1(sav1.RivalStarter);
+        return AppService.GetSpeciesComboItem(nationalSpeciesId);
+    }
+
+    private void SetGen1RivalStarter(SAV1 sav1, ComboItem species)
+    {
+        var internalSpeciesId = SpeciesConverter.GetInternal1((byte)species.Value);
+        sav1.RivalStarter = internalSpeciesId;
+    }
 }