diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterMovesetGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterMovesetGenerator.cs
index 689e22736..6262c09f5 100644
--- a/PKHeX.Core/Legality/Encounters/Generator/EncounterMovesetGenerator.cs
+++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterMovesetGenerator.cs
@@ -143,9 +143,10 @@ namespace PKHeX.Core
                 // Any egg move can be obtained
                 var evo = dl[dl.Count - 1];
                 var shared = MoveEgg.GetEggMoves(8, evo.Species, evo.Form, GameVersion.SW);
-                return moves.Concat(shared);
+                if (shared.Length != 0)
+                    moves = moves.Concat(shared);
             }
-            if (dl[0].Species == (int)Species.Shedinja)
+            if (pk.Species == (int)Species.Shedinja)
             {
                 // Leveling up Nincada in Gen3/4 levels up, evolves to Ninjask, applies moves for Ninjask, then spawns Shedinja with the current moveset.
                 // Future games spawn the Shedinja before doing Ninjask moves, so this is a special case.