diff --git a/PKHeX.Core/Legality/LegalityAnalysis.cs b/PKHeX.Core/Legality/LegalityAnalysis.cs
index 6316bfde9..06db5a554 100644
--- a/PKHeX.Core/Legality/LegalityAnalysis.cs
+++ b/PKHeX.Core/Legality/LegalityAnalysis.cs
@@ -1,4 +1,4 @@
-//#define SUPPRESS
+#define SUPPRESS
 
 using System;
 using System.Collections.Generic;
diff --git a/PKHeX.Drawing.PokeSprite/Util/SpriteUtil.cs b/PKHeX.Drawing.PokeSprite/Util/SpriteUtil.cs
index 916f3da7d..95023bb04 100644
--- a/PKHeX.Drawing.PokeSprite/Util/SpriteUtil.cs
+++ b/PKHeX.Drawing.PokeSprite/Util/SpriteUtil.cs
@@ -110,7 +110,10 @@ public static class SpriteUtil
             }
             if (flagIllegal)
             {
-                var la = new LegalityAnalysis(pk, sav.Personal, storage);
+                var la = pk.GetType() == sav.PKMType // quick sanity check
+                    ? new LegalityAnalysis(pk, sav.Personal, storage)
+                    : new LegalityAnalysis(pk, pk.PersonalInfo, storage);
+
                 if (!la.Valid)
                     sprite = ImageUtil.LayerImage(sprite, Resources.warn, 0, FlagIllegalShiftY);
                 else if (pk.Format >= 8 && MoveInfo.IsDummiedMoveAny(pk))