diff --git a/PKHeX.Core/PKM/Shared/GBPKM.cs b/PKHeX.Core/PKM/Shared/GBPKM.cs
index 05dcd3a32..20ad9079c 100644
--- a/PKHeX.Core/PKM/Shared/GBPKM.cs
+++ b/PKHeX.Core/PKM/Shared/GBPKM.cs
@@ -203,7 +203,7 @@ protected int TransferLanguage(int destLanguage)
 
     public override void LoadStats(IBaseStat p, Span<ushort> stats)
     {
-        var lv = Stat_Level;
+        var lv = CurrentLevel; // recalculate instead of checking Stat_Level
         stats[0] = (ushort)(GetStat(p.HP, IV_HP, EV_HP, lv) + (5 + lv)); // HP
         stats[1] = GetStat(p.ATK, IV_ATK, EV_ATK, lv);
         stats[2] = GetStat(p.DEF, IV_DEF, EV_DEF, lv);
diff --git a/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs
index 19a7c3ac2..074c1731f 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs	
@@ -389,7 +389,9 @@ public void UpdateStats()
         {
             var pt = MainEditor.RequestSaveFile.Personal;
             var pi = pt.GetFormEntry(Entity.Species, Entity.Form);
-            Entity.SetStats(Entity.GetStats(pi));
+            Span<ushort> stats = stackalloc ushort[6];
+            Entity.LoadStats(pi, stats);
+            Entity.SetStats(stats);
             LoadBST(pi);
             LoadPartyStats(Entity);
         }