Index: lldb/source/Target/Thread.cpp
===================================================================
--- lldb/source/Target/Thread.cpp
+++ lldb/source/Target/Thread.cpp
@@ -378,7 +378,8 @@
     const uint32_t process_stop_id = process_sp->GetStopID();
     if (m_stop_info_stop_id != process_stop_id) {
       if (m_stop_info_sp) {
-        if (m_stop_info_sp->IsValid() || IsStillAtLastBreakpointHit() ||
+        if (m_stop_info_sp->IsValid() ||
+            (IsStillAtLastBreakpointHit() && m_resume_state != eStateSuspended) ||
             GetCurrentPlan()->IsVirtualStep())
           SetStopInfo(m_stop_info_sp);
         else