diff --git a/PKHeX.Core/Legality/Core.cs b/PKHeX.Core/Legality/Core.cs
index 76d7c1c74..04401b7d8 100644
--- a/PKHeX.Core/Legality/Core.cs
+++ b/PKHeX.Core/Legality/Core.cs
@@ -2132,7 +2132,7 @@ private static int GetMaxLevelGeneration(PKM pkm)
         private static int GetMaxLevelGeneration(PKM pkm, int generation)
         {
             if (!pkm.InhabitedGeneration(generation))
-                return -1;
+                return pkm.Met_Level;
 
             if (pkm.Format <= 2)
             {
diff --git a/PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs b/PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs
index c698a7ed2..74ad64d5b 100644
--- a/PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs
+++ b/PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs
@@ -258,9 +258,6 @@ private static CheckMoveResult[] ParseMoves(PKM pkm, int[] moves, int[] special,
             int[] generations = GetGenMovesCheckOrder(pkm);
             foreach (var gen in generations)
             {
-                if (!pkm.InhabitedGeneration(gen))
-                    continue;
-
                 var HMLearned = new int[0];
                 // Check if pokemon knows HM moves from generation 3 and 4 but are not valid yet, that means it cant learn the HMs in future generations
                 bool KnowDefogWhirlpool = false;
diff --git a/PKHeX.Core/PKM/PKM.cs b/PKHeX.Core/PKM/PKM.cs
index 429ada74e..e3bfa8513 100644
--- a/PKHeX.Core/PKM/PKM.cs
+++ b/PKHeX.Core/PKM/PKM.cs
@@ -533,7 +533,7 @@ public bool InhabitedGeneration(int Generation, int species = -1)
                 return false;
 
             // Sanity Check Species ID
-            if (Legal.GetMaxSpeciesOrigin(GenNumber) < species && !Legal.GetFutureGenEvolutions(GenNumber).Contains(species))
+            if (Legal.GetMaxSpeciesOrigin(Generation) < species && !Legal.GetFutureGenEvolutions(Generation).Contains(species))
                 return false;
 
             // Trade generation 1 -> 2