diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 7572c30fba3cca963821bb7b66d319e6486ecb72..bc5be521b819c418830f8c87c8c4bd00ddab7170 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -101,6 +101,7 @@ namespace Internal {
 #else
 #   define PENDING_DEBUG(s)
 #endif
+#define PENDING_DEBUGX(s) qDebug() << s
 
 #define CB(callback) &GdbEngine::callback, STRINGIFY(callback)
 
@@ -3379,6 +3380,8 @@ void GdbEngine::updateLocals(const QVariant &cookie)
 {
     m_pendingRequests = 0;
     if (isSynchroneous()) {
+        manager()->watchHandler()->beginCycle();
+        m_toolTipExpression.clear();
         QStringList expanded = m_manager->watchHandler()->expandedINames().toList();
         postCommand(_("bb %1 %2")
                 .arg(int(theDebuggerBoolSetting(UseDebuggingHelpers)))
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 6b774591764af421b61abff2fa1e2f0017a9fe6b..23a7109a1db3d4534c6ed4daaba75f5de18f68c5 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -1095,7 +1095,6 @@ void WatchHandler::beginCycle()
 
 void WatchHandler::endCycle()
 {
-    //qDebug() << "END CYCLE";
     m_locals->endCycle();
     m_watchers->endCycle();
     m_tooltips->endCycle();