diff --git a/PKHeX.Core/Legality/Moves/MoveEgg.cs b/PKHeX.Core/Legality/Moves/MoveEgg.cs
index 5dba5ca05..9623d44ae 100644
--- a/PKHeX.Core/Legality/Moves/MoveEgg.cs
+++ b/PKHeX.Core/Legality/Moves/MoveEgg.cs
@@ -68,8 +68,13 @@ private static int[] GetEggMoves(int gen, int species, int formnum, GameVersion
         private static int[] GetFormEggMoves(int species, int formnum, IReadOnlyList<EggMoves7> table)
         {
             var entry = table[species];
-            if (formnum > 0 && AlolanOriginForms.Contains(species))
-                entry = table[entry.FormTableIndex + formnum - 1];
+            if (formnum > 0)
+            {
+                if (AlolanOriginForms.Contains(species))
+                    entry = table[entry.FormTableIndex + formnum - 1];
+                else if (GalarOriginForms.Contains(species))
+                    entry = table[entry.FormTableIndex + formnum - 1];
+            }
             return entry.Moves;
         }