diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SteppingController.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SteppingController.java
index 9fad4686532..6dcb37110c6 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SteppingController.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SteppingController.java
@@ -465,7 +465,9 @@ public final class SteppingController
 	 * @param execCtx
 	 */
 	private void disableStepping(IExecutionDMContext execCtx) {
-        fStepInProgress.put(execCtx, new ArrayList<ISteppingControlParticipant>(fParticipants));
+		if (!fParticipants.isEmpty()) {
+			fStepInProgress.put(execCtx, new ArrayList<ISteppingControlParticipant>(fParticipants));
+		}
 	}
 
     /**