diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp
index 821217873e9..0cb1aadb05c 100644
--- a/src/plugins/cppeditor/cppeditorwidget.cpp
+++ b/src/plugins/cppeditor/cppeditorwidget.cpp
@@ -478,8 +478,7 @@ void CppEditorWidget::finalizeInitialization()
 
     // set up the use highlighitng
     connect(this, &CppEditorWidget::cursorPositionChanged, this, [this] {
-        if (!d->m_localRenaming.isActive())
-            d->m_useSelectionsUpdater.scheduleUpdate();
+        d->m_useSelectionsUpdater.scheduleUpdate();
 
         // Notify selection expander about the changed cursor.
         d->m_cppSelectionChanger.onCursorPositionChanged(textCursor());
@@ -1223,12 +1222,10 @@ void CppEditorWidget::updateSemanticInfo(const SemanticInfo &semanticInfo,
 
     d->m_lastSemanticInfo = semanticInfo;
 
-    if (!d->m_localRenaming.isActive()) {
-        const CppUseSelectionsUpdater::CallType type = updateUseSelectionSynchronously
-            ? CppUseSelectionsUpdater::CallType::Synchronous
-            : CppUseSelectionsUpdater::CallType::Asynchronous;
-        d->m_useSelectionsUpdater.update(type);
-    }
+    const CppUseSelectionsUpdater::CallType type
+        = updateUseSelectionSynchronously ? CppUseSelectionsUpdater::CallType::Synchronous
+                                          : CppUseSelectionsUpdater::CallType::Asynchronous;
+    d->m_useSelectionsUpdater.update(type);
 
     // schedule a check for a decl/def link
     updateFunctionDeclDefLink();
diff --git a/src/plugins/cppeditor/cppuseselectionsupdater.cpp b/src/plugins/cppeditor/cppuseselectionsupdater.cpp
index 7d7bfe98006..e03475ea80d 100644
--- a/src/plugins/cppeditor/cppuseselectionsupdater.cpp
+++ b/src/plugins/cppeditor/cppuseselectionsupdater.cpp
@@ -52,7 +52,8 @@ CppUseSelectionsUpdater::RunnerInfo CppUseSelectionsUpdater::update(CallType cal
     auto *cppEditorDocument = qobject_cast<CppEditorDocument *>(cppEditorWidget->textDocument());
     QTC_ASSERT(cppEditorDocument, return RunnerInfo::FailedToStart);
 
-    m_updateSelections = !CppModelManager::usesClangd(cppEditorDocument);
+    m_updateSelections = !CppModelManager::usesClangd(cppEditorDocument)
+                         && !m_editorWidget->isRenaming();
 
     CursorInfoParams params;
     params.semanticInfo = cppEditorWidget->semanticInfo();
@@ -138,10 +139,6 @@ void CppUseSelectionsUpdater::onFindUsesFinished()
         emit finished(SemanticInfo::LocalUseMap(), false);
         return;
     }
-    if (m_editorWidget->isRenaming()) {
-        emit finished({}, false);
-        return;
-    }
 
     processResults(m_runnerWatcher->result());