diff --git a/src/plugins/debugger/dap/dapengine.cpp b/src/plugins/debugger/dap/dapengine.cpp
index 0f0b31772d4..1cb129d445b 100644
--- a/src/plugins/debugger/dap/dapengine.cpp
+++ b/src/plugins/debugger/dap/dapengine.cpp
@@ -409,8 +409,12 @@ void DapEngine::assignValueInDebugger(WatchItem *, const QString &/*expression*/
 void DapEngine::updateItem(const QString &iname)
 {
     WatchItem *item = watchHandler()->findItem(iname);
-    m_currentWatchItem = item;
-    m_dapClient->variables(item->variablesReference);
+
+    if (m_currentWatchItem != item) {
+        m_currentWatchItem = item;
+        m_isFirstLayer = false;
+        m_dapClient->variables(item->variablesReference);
+    }
 }
 
 QString DapEngine::errorMessage(QProcess::ProcessError error) const
@@ -542,20 +546,23 @@ void DapEngine::handleScopesResponse(const QJsonObject &response)
     if (!response.value("success").toBool())
         return;
 
+    watchHandler()->cleanup();
+    watchHandler()->removeAllData();
+    watchHandler()->notifyUpdateStarted();
+
+    m_watchItems.clear();
+
     QJsonArray scopes = response.value("body").toObject().value("scopes").toArray();
     for (const QJsonValueRef &scope : scopes) {
         const QString name = scope.toObject().value("name").toString();
-        const int variablesReference = scope.toObject().value("variablesReference").toInt();
-        qCDebug(dapEngineLog) << "scoped success" << name << variablesReference;
-        if (name == "Locals") { // Fix for several scopes
-            watchHandler()->removeAllData();
-            watchHandler()->notifyUpdateStarted();
-
-            m_watchItems.clear();
-            watchHandler()->cleanup();
-            m_dapClient->variables(variablesReference);
-        }
+        if (name == "Registers")
+            continue;
+        m_variablesReferenceQueue.push(scope.toObject().value("variablesReference").toInt());
     }
+
+    m_isFirstLayer = true;
+    m_dapClient->variables(m_variablesReferenceQueue.front());
+    m_variablesReferenceQueue.pop();
 }
 
 void DapEngine::handleThreadsResponse(const QJsonObject &response)
@@ -695,7 +702,6 @@ void DapEngine::handleBreakpointEvent(const QJsonObject &event)
 
 void DapEngine::refreshLocals(const QJsonArray &variables)
 {
-    bool isFirstLayer = m_watchItems.isEmpty();
     for (auto variable : variables) {
         WatchItem *item = new WatchItem;
         const QString name = variable.toObject().value("name").toString();
@@ -711,18 +717,24 @@ void DapEngine::refreshLocals(const QJsonArray &variables)
         if (variablesReference > 0)
             item->wantsChildren = true;
 
-        qCDebug(dapEngineLog) << "variable" << name << item->hexAddress();
-        if (isFirstLayer)
+        qCDebug(dapEngineLog) << "variable" << name << variablesReference;
+        if (m_isFirstLayer)
             m_watchItems.append(item);
         else
             m_currentWatchItem->appendChild(item);
     }
 
-    if (isFirstLayer) {
-        for (auto item : m_watchItems)
-            watchHandler()->insertItem(item);
-    } else
+    if (m_isFirstLayer) {
+        if (m_variablesReferenceQueue.empty()) {
+            for (auto item : m_watchItems)
+                watchHandler()->insertItem(item);
+        } else {
+            m_dapClient->variables(m_variablesReferenceQueue.front());
+            m_variablesReferenceQueue.pop();
+        }
+    } else {
         watchHandler()->updateWatchExpression(m_currentWatchItem, "");
+    }
 
     watchHandler()->notifyUpdateFinished();
 }
diff --git a/src/plugins/debugger/dap/dapengine.h b/src/plugins/debugger/dap/dapengine.h
index 1f5525bc947..6f650c05419 100644
--- a/src/plugins/debugger/dap/dapengine.h
+++ b/src/plugins/debugger/dap/dapengine.h
@@ -113,6 +113,8 @@ protected:
     int m_nextBreakpointId = 1;
     int m_currentThreadId = -1;
 
+    bool m_isFirstLayer = true;
+    std::queue<int> m_variablesReferenceQueue;
     WatchItem *m_currentWatchItem = nullptr;
     QList<WatchItem *> m_watchItems;
 };