diff --git a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs
index be8768192..9470ec17a 100644
--- a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs
+++ b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs
@@ -91,7 +91,9 @@ bool IsValidPikachuCap()
                     }
                 case (int)Species.Keldeo:
                 {
-                    if (Info.Generation == 5) // can mismatch in gen5 via BW tutor and transfer up
+                     // can mismatch in gen5 via BW tutor and transfer up
+                     // can mismatch in gen8+ as the form activates in battle when knowing the move; outside of battle can be either state.
+                    if (Info.Generation == 5 || pkm.Format >= 8)
                         break;
                     int index = Array.IndexOf(pkm.Moves, 548); // Secret Sword
                     bool noSword = index < 0;