diff --git a/PKHeX.Core/Editing/CommonEdits.cs b/PKHeX.Core/Editing/CommonEdits.cs
index 7261deba9..a14774b55 100644
--- a/PKHeX.Core/Editing/CommonEdits.cs
+++ b/PKHeX.Core/Editing/CommonEdits.cs
@@ -606,6 +606,10 @@ public static int[] GetMoveSet(this PKM pkm, bool random = false, LegalityAnalys
             int[] m = la.GetSuggestedMoves(tm: random, tutor: random, reminder: random);
             if (m == null)
                 return pkm.Moves;
+
+            if (!m.All(z => la.AllSuggestedMovesAndRelearn.Contains(z)))
+                m = m.Intersect(la.AllSuggestedMovesAndRelearn).ToArray();
+
             if (random)
                 Util.Shuffle(m);