diff --git a/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.cs b/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.cs
index ce0eb4a06..f6416fee4 100644
--- a/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.cs	
+++ b/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.cs	
@@ -189,10 +189,20 @@ private void runBackgroundWorker()
                 len = err = ctr = 0;
                 if (RB_SAV.Checked)
                 {
-                    var data = Main.SAV.BoxData;
-                    setupProgressBar(data.Length);
-                    processSAV(data, Filters, Instructions);
-                    Main.SAV.BoxData = data;
+                    if (Main.SAV.HasParty)
+                    {
+                        var data = Main.SAV.PartyData;
+                        setupProgressBar(data.Length);
+                        processSAV(data, Filters, Instructions);
+                        Main.SAV.PartyData = data;
+                    }
+                    if (Main.SAV.HasBox)
+                    {
+                        var data = Main.SAV.BoxData;
+                        setupProgressBar(data.Length);
+                        processSAV(data, Filters, Instructions);
+                        Main.SAV.BoxData = data;
+                    }
                 }
                 else
                 {