diff --git a/PKHeX.Core/Saves/Util/SaveUtil.cs b/PKHeX.Core/Saves/Util/SaveUtil.cs
index f3af0033d..2fa37adfb 100644
--- a/PKHeX.Core/Saves/Util/SaveUtil.cs
+++ b/PKHeX.Core/Saves/Util/SaveUtil.cs
@@ -565,8 +565,16 @@ public static SaveFile GetBlankSAV(GameVersion game, string trainerName)
             SAV.OT = trainerName;
 
             // Secondary Properties may not be used but can be filled in as template.
-            SAV.TID = 12345;
-            SAV.SID = 54321;
+            if (SAV.Generation >= 7)
+            {
+                SAV.TrainerID7 = 123456;
+                SAV.TrainerSID7 = 1234;
+            }
+            else
+            {
+                SAV.TID = 12345;
+                SAV.SID = 54321;
+            }
             SAV.Language = (int)LanguageID.English; // English
 
             // Only set geolocation data for 3DS titles