diff --git a/source/Commands/CommandObjectProcess.cpp b/source/Commands/CommandObjectProcess.cpp
index 3e7a0b4..7744505 100644
--- a/source/Commands/CommandObjectProcess.cpp
+++ b/source/Commands/CommandObjectProcess.cpp
@@ -302,7 +302,10 @@ protected:
             if (m_options.launch_info.GetFlags().Test(eLaunchFlagStopAtEntry) == false)
             {
                 result.SetStatus (eReturnStatusSuccessContinuingNoResult);
-                StateType state = process->WaitForProcessToStop (NULL);
+                state = process->GetState();
+                if (!StateIsStoppedState(state, false)) {
+                    state = process->WaitForProcessToStop (NULL);
+                }
 
                 if (state == eStateStopped)
                 {