diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractLaunchVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractLaunchVMProvider.java
index 7f7d3b1299e..2455d4dfc9c 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractLaunchVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractLaunchVMProvider.java
@@ -145,12 +145,12 @@ public class AbstractLaunchVMProvider extends AbstractDMVMProvider
 						    }
 						});
                     }
+                    if (rm != null) {
+                    	rm.done();
+                    }
+                    return;
                 }
             }
-            if (rm != null) {
-            	rm.done();
-            }
-            return;
         } else if (event instanceof IRunControl.ISuspendedDMEvent) {
     		final IExecutionDMContext exeContext= ((IRunControl.ISuspendedDMEvent) event).getDMContext();
     		ScheduledFuture<?> refreshStackFramesFuture = getRefreshFuture(exeContext);