diff --git a/PKHeX/Subforms/PKM Editors/SuperTrainingEditor.cs b/PKHeX/Subforms/PKM Editors/SuperTrainingEditor.cs
index d80df49e2..87fbbde09 100644
--- a/PKHeX/Subforms/PKM Editors/SuperTrainingEditor.cs	
+++ b/PKHeX/Subforms/PKM Editors/SuperTrainingEditor.cs	
@@ -134,12 +134,14 @@ public RegimenInfo(string name, bool completedRegimen)
 
         private void B_All_Click(object sender, EventArgs e)
         {
+            if (CHK_SecretUnlocked.Checked) // only give dist if Secret is Unlocked (None -> All -> All*)
+                foreach (var c in TLP_DistSuperTrain.Controls.OfType<CheckBox>())
+                    c.Checked = true;
+            
             CHK_SecretUnlocked.Checked = true;
             CHK_SecretComplete.Checked = true;
             foreach (var c in TLP_SuperTrain.Controls.OfType<CheckBox>())
                 c.Checked = true;
-            foreach (var c in TLP_DistSuperTrain.Controls.OfType<CheckBox>())
-                c.Checked = true;
         }
         private void B_None_Click(object sender, EventArgs e)
         {