diff --git a/src/plugins/debugger/dap/dapengine.cpp b/src/plugins/debugger/dap/dapengine.cpp
index 6be4aec835f..180b3bdf1a7 100644
--- a/src/plugins/debugger/dap/dapengine.cpp
+++ b/src/plugins/debugger/dap/dapengine.cpp
@@ -569,8 +569,11 @@ void DapEngine::handleThreadsResponse(const QJsonObject &response)
         handler->updateThread(threadData);
     }
 
-    if (m_currentThreadId)
-        handler->setCurrentThread(threadsHandler()->threadForId(QString::number(m_currentThreadId)));
+    if (m_currentThreadId) {
+        Thread thread = threadsHandler()->threadForId(QString::number(m_currentThreadId));
+        if (thread && thread != threadsHandler()->currentThread())
+            handler->setCurrentThread(thread);
+    }
 }
 
 void DapEngine::handleEvent(DapEventType type, const QJsonObject &event)