diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
index 42b73f60ea..f51ad4b456 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
@@ -1952,10 +1952,6 @@ CommandCommunication (
       if (Data8 == DEBUG_DATA_BREAK_CAUSE_IMAGE_LOAD || Data8 == DEBUG_DATA_BREAK_CAUSE_IMAGE_UNLOAD) {
         CpuContext->Dr0 = 0;
       }
-      //
-      // Clear Stepping Flag
-      //
-      SetDebugFlag (DEBUG_AGENT_FLAG_STEPPING, 0);
 
       if (!HaltDeferred) {
         //
@@ -2410,6 +2406,10 @@ InterruptProcess (
         mDebugMpContext.BreakAtCpuIndex = ProcessorIndex;
       }
       SendAckPacket (DEBUG_COMMAND_OK);
+      //
+      // Clear Stepping Flag
+      //
+      SetDebugFlag (DEBUG_AGENT_FLAG_STEPPING, 0);
       CommandCommunication (Vector, CpuContext, BreakReceived);
       break;