diff --git a/PKHeX.Core/Legality/Checks.cs b/PKHeX.Core/Legality/Checks.cs
index 9b978f98b..e92a031bc 100644
--- a/PKHeX.Core/Legality/Checks.cs
+++ b/PKHeX.Core/Legality/Checks.cs
@@ -803,13 +803,14 @@ private void VerifyFormFriendSafari()
                         AddLine(Severity.Invalid, V64, CheckIdentifier.Form);
                     break;
                 case 710: // Pumpkaboo
-                case 711: // Goregeist
-                    if (pkm.AltForm != 0) // Average
-                        AddLine(Severity.Invalid, V6, CheckIdentifier.Form);
+                case 711 when pkm.AltForm != 0: // Goregeist Average
+                    AddLine(Severity.Invalid, V6, CheckIdentifier.Form);
                     break;
-                case 586: // Sawsbuck
-                    if (pkm.AltForm != 0)
-                        AddLine(Severity.Invalid, V65, CheckIdentifier.Form);
+                case 423 when pkm.AltForm != 0: // Gastrodon West
+                    AddLine(Severity.Invalid, V64, CheckIdentifier.Form);
+                    break;
+                case 586 when pkm.AltForm != 0: // Sawsbuck
+                    AddLine(Severity.Invalid, V65, CheckIdentifier.Form);
                     break;
             }
         }
diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs
index aeaf86f63..5e1bd2eee 100644
--- a/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs
+++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs
@@ -93,8 +93,6 @@ public static IEnumerable<EncounterSlot> GetValidFriendSafari(PKM pkm)
         {
             if (!pkm.XY || pkm.Met_Location != 148 || pkm.Met_Level != 30) // Friend Safari
                 return Enumerable.Empty<EncounterSlot>();
-            if (pkm.Species == 423 && pkm.AltForm != 0)
-                return Enumerable.Empty<EncounterSlot>();
             var vs = EvolutionChain.GetValidPreEvolutions(pkm).Where(d => d.Level >= 30);
             return vs.SelectMany(z => Encounters6.FriendSafari[z.Species]);
         }