diff --git a/PKHeX.Core/Saves/SaveFile.cs b/PKHeX.Core/Saves/SaveFile.cs
index 87910290a..f16e3af21 100644
--- a/PKHeX.Core/Saves/SaveFile.cs
+++ b/PKHeX.Core/Saves/SaveFile.cs
@@ -793,7 +793,7 @@ protected virtual void SetPartyValues(PKM pkm, bool isParty)
         {
             if (!isParty)
                 return;
-            if (pkm.Stat_HPMax != 0) // Stats already present
+            if (pkm.PartyStatsPresent) // Stats already present
                 return;
             pkm.SetStats(pkm.GetStats(pkm.PersonalInfo));
             pkm.Stat_Level = pkm.CurrentLevel;
diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
index 584c4137c..642720b0d 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
@@ -247,7 +247,7 @@ private void LoadFieldsFromPKM(PKM pk, bool focus = true, bool skipConversionChe
 
             if (HaX) // Load original values from pk not pkm
             {
-                MT_Level.Text = (pk.Stat_HPMax != 0 ? pk.Stat_Level : Experience.GetLevel(pk.EXP, pk.Species, pk.AltForm)).ToString();
+                MT_Level.Text = (pk.PartyStatsPresent ? pk.Stat_Level : Experience.GetLevel(pk.EXP, pk.Species, pk.AltForm)).ToString();
                 TB_EXP.Text = pk.EXP.ToString();
                 MT_Form.Text = Math.Max(0, pk.AltForm).ToString();
                 if (pk.PartyStatsPresent) // stats present