diff --git a/PKHeX.Core/MysteryGifts/WC8.cs b/PKHeX.Core/MysteryGifts/WC8.cs
index afa55a2f2..309b844c3 100644
--- a/PKHeX.Core/MysteryGifts/WC8.cs
+++ b/PKHeX.Core/MysteryGifts/WC8.cs
@@ -389,7 +389,13 @@ public override PKM ConvertToPKM(ITrainerInfo sav, EncounterCriteria criteria)
                 pk.SID = sav.SID;
 
                 if (IsHOMEGift)
+                {
                     pk.TrainerSID7 = 0;
+                    while (pk.TSV == 0)
+                    {
+                        pk.TrainerID7 = Util.Rand.Next(16, 999_999);
+                    }
+                }
             }
 
             // Official code explicitly corrects for Meowstic
@@ -535,6 +541,9 @@ protected override bool IsMatchExact(PKM pkm, DexLevel evo)
                     if (EncryptionConstant != pkm.EncryptionConstant)
                         return false;
 
+                    if (pkm.TSV == 0) // HOME doesn't assign TSV=0 to accounts.
+                        return false;
+
                     if (IsShiny)
                     {
                         if (!pkm.IsShiny)