diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs
index dd83657fa..fe1699971 100644
--- a/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs	
+++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs	
@@ -23,7 +23,7 @@ public SAV_PokedexORAS()
             // Fill List
             CB_Species.DisplayMember = "Text";
             CB_Species.ValueMember = "Value";
-            CB_Species.DataSource = new BindingSource(GameInfo.SpeciesDataSource.Skip(1).ToList(), null);
+            CB_Species.DataSource = new BindingSource(GameInfo.SpeciesDataSource.Skip(1).Where(id => id.Value <= SAV.MaxSpeciesID).ToList(), null);
 
             for (int i = 1; i < SAV.MaxSpeciesID + 1; i++)
                 LB_Species.Items.Add(i.ToString("000") + " - " + Main.GameStrings.specieslist[i]);
diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs
index 28f5a205f..97b7e83b4 100644
--- a/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs	
+++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs	
@@ -23,7 +23,7 @@ public SAV_PokedexXY()
             // Fill List
             CB_Species.DisplayMember = "Text";
             CB_Species.ValueMember = "Value";
-            CB_Species.DataSource = new BindingSource(GameInfo.SpeciesDataSource.Skip(1).ToList(), null);
+            CB_Species.DataSource = new BindingSource(GameInfo.SpeciesDataSource.Skip(1).Where(id => id.Value <= SAV.MaxSpeciesID).ToList(), null);
 
             for (int i = 1; i < SAV.MaxSpeciesID + 1; i++)
                 LB_Species.Items.Add(i.ToString("000") + " - " + Main.GameStrings.specieslist[i]);