diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs
index 7e82d3090..80fd7832f 100644
--- a/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs
+++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs
@@ -164,20 +164,6 @@ private static bool IsHiddenAbilitySlot(this EncounterSlot slot)
             return slot.Permissions.DexNav || slot.Type == SlotType.FriendSafari || slot.Type == SlotType.Horde || slot.Type == SlotType.SOS;
         }
 
-        internal static bool IsDexNavValid(PKM pkm)
-        {
-            if (!pkm.AO || !pkm.InhabitedGeneration(6))
-                return false;
-
-            var vs = EvolutionChain.GetValidPreEvolutions(pkm);
-            var table = pkm.Version == (int) GameVersion.AS ? SlotsA : SlotsO;
-            int loc = pkm.Met_Location;
-            var areas = table.Where(l => l.Location == loc);
-            var minlvl = GetMinLevelEncounter(pkm);
-            var d_areas = areas.Select(area => GetValidEncounterSlots(pkm, area, vs, minlvl));
-            return d_areas.Any(slots => slots.Any(slot => slot.Permissions.AllowDexNav && slot.Permissions.DexNav));
-        }
-
         internal static EncounterArea GetCaptureLocation(PKM pkm)
         {
             var vs = EvolutionChain.GetValidPreEvolutions(pkm);
diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs b/PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs
index 17a1c512f..a6d94a4d7 100644
--- a/PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs
+++ b/PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs
@@ -23,7 +23,7 @@ public static CheckResult[] VerifyRelearn(PKM pkm, LegalInfo info)
                 MysteryGift g => VerifyRelearnSpecifiedMoveset(pkm, info, g.RelearnMoves),
                 IRelearn s when s.Relearn.Length > 0 => VerifyRelearnSpecifiedMoveset(pkm, info, s.Relearn),
                 EncounterEgg e => VerifyRelearnEggBase(pkm, info, e),
-                EncounterSlot z when pkm.RelearnMove1 != 0 && z.Permissions.DexNav && EncounterSlotGenerator.IsDexNavValid(pkm) => VerifyRelearnDexNav(pkm, info),
+                EncounterSlot z when pkm.RelearnMove1 != 0 && z.Permissions.DexNav => VerifyRelearnDexNav(pkm, info),
                 _ => VerifyRelearnNone(pkm, info)
             };
         }
@@ -50,8 +50,8 @@ private static CheckResult[] VerifyRelearnDexNav(PKM pkm, LegalInfo info)
             int[] RelearnMoves = pkm.RelearnMoves;
 
             // DexNav Pokémon can have 1 random egg move as a relearn move.
-            var enc = info.EncounterMatch;
-            result[0] = !Legal.GetValidRelearn(pkm, enc.Species, enc.Form, true).Contains(RelearnMoves[0])
+            var baseSpec = Legal.GetBaseSpecies(pkm);
+            result[0] = !Legal.GetValidRelearn(pkm, baseSpec.Species, baseSpec.Form, true).Contains(RelearnMoves[0])
                 ? new CheckResult(Severity.Invalid, LMoveRelearnDexNav, CheckIdentifier.RelearnMove)
                 : new CheckResult(CheckIdentifier.RelearnMove);
 
diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 6/035 - Clefairy - 2A2C8A94FA80 dexnav.pk6 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 6/035 - Clefairy - 2A2C8A94FA80 dexnav.pk6
new file mode 100644
index 000000000..69afc0d58
Binary files /dev/null and b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 6/035 - Clefairy - 2A2C8A94FA80 dexnav.pk6 differ
diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 6/087 - Dewgong - B33438369BC5 dexnav.pk6 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 6/087 - Dewgong - B33438369BC5 dexnav.pk6
new file mode 100644
index 000000000..2789bfe55
Binary files /dev/null and b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 6/087 - Dewgong - B33438369BC5 dexnav.pk6 differ
diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 6/097 - Hypno - F845514A2D54 dexnav.pk6 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 6/097 - Hypno - F845514A2D54 dexnav.pk6
new file mode 100644
index 000000000..5198eea90
Binary files /dev/null and b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 6/097 - Hypno - F845514A2D54 dexnav.pk6 differ
diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 6/295 - Exploud - 24A2112B6A94 dexnav.pk6 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 6/295 - Exploud - 24A2112B6A94 dexnav.pk6
new file mode 100644
index 000000000..2ef5c33c1
Binary files /dev/null and b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 6/295 - Exploud - 24A2112B6A94 dexnav.pk6 differ