diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp
index ee46501..a2c3e6a 100644
--- a/lldb/source/Commands/CommandObjectThread.cpp
+++ b/lldb/source/Commands/CommandObjectThread.cpp
@@ -449,6 +449,13 @@
             bool bool_stop_other_threads;
             if (m_options.m_run_mode == eAllThreads)
                 bool_stop_other_threads = false;
+            else if (m_options.m_run_mode == eOnlyDuringStepping)
+            {
+                if (m_step_type == eStepTypeOut)
+                    bool_stop_other_threads = false;
+                else
+                    bool_stop_other_threads = true;
+            }
             else
                 bool_stop_other_threads = true;