diff --git a/PKHeX.Core/PKM/PK7.cs b/PKHeX.Core/PKM/PK7.cs
index b677da2cb..230baa742 100644
--- a/PKHeX.Core/PKM/PK7.cs
+++ b/PKHeX.Core/PKM/PK7.cs
@@ -541,7 +541,7 @@ public PK8 ConvertToPK8()
                 Gender = Gender,
                 AltForm = AltForm,
                 Nature = Nature,
-                Nickname = Nickname,
+                Nickname = IsNicknamed ? Nickname : SpeciesName.GetSpeciesNameGeneration(Species, Language, 8),
                 Version = Version,
                 OT_Name = OT_Name,
                 MetDate = MetDate,