diff --git a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs
index 36371cb15..53fb7cd9d 100644
--- a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs
+++ b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs
@@ -349,7 +349,7 @@ private static void VerifyTradeOTOnly(LegalityAnalysis data, EncounterTrade t)
         private static CheckResult CheckTradeOTOnly(LegalityAnalysis data, IReadOnlyList<string> validOT)
         {
             var pkm = data.pkm;
-            if (pkm.IsNicknamed && pkm.Format < 8)
+            if (pkm.IsNicknamed && (pkm.Format < 8 || pkm.FatefulEncounter))
                 return GetInvalid(LEncTradeChangedNickname, CheckIdentifier.Nickname);
             int lang = pkm.Language;
             if (validOT.Count <= lang)
@@ -363,7 +363,10 @@ private static void VerifyTrade(LegalityAnalysis data, EncounterTrade t, int lan
         {
             var ot = t.GetOT(language);
             var nick = t.GetNickname(language);
-            VerifyTradeOTNick(data, t, nick, ot);
+            if (string.IsNullOrEmpty(nick))
+                VerifyTradeOTOnly(data, t);
+            else
+                VerifyTradeOTNick(data, t, nick, ot);
         }
 
         private static void VerifyTradeOTNick(LegalityAnalysis data, EncounterTrade t, string nick, string OT)