diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs
index b294859b0..4b7f0b903 100644
--- a/PKHeX/Legality/Core.cs
+++ b/PKHeX/Legality/Core.cs
@@ -418,10 +418,13 @@ private static IEnumerable<MysteryGift> getMatchingWC7(PKM pkm, IEnumerable<Myst
             {
                 if (pkm.Egg_Location == 0) // Not Egg
                 {
-                    if (wc.SID != pkm.SID) continue;
-                    if (wc.TID != pkm.TID) continue;
+                    if (wc.OTGender != 3)
+                    {
+                        if (wc.SID != pkm.SID) continue;
+                        if (wc.TID != pkm.TID) continue;
+                        if (wc.OTGender != pkm.OT_Gender) continue;
+                    }
                     if (!string.IsNullOrEmpty(wc.OT) && wc.OT != pkm.OT_Name) continue;
-                    if (wc.OTGender != 3 && wc.OTGender != pkm.OT_Gender) continue;
                     if (wc.PIDType == 0 && pkm.PID != wc.PID) continue;
                     if (wc.PIDType == 2 && !pkm.IsShiny) continue;
                     if (wc.PIDType == 3 && pkm.IsShiny) continue;