diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp
index db76cd56982..2e61fa1819f 100644
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -489,9 +489,8 @@ void ClangdClient::findUsages(TextDocument *document, const QTextCursor &cursor,
     if (searchTerm.isEmpty())
         return;
 
-    // Will fix QTCREATORBUG-27978 and QTCREATORBUG-28109 once enabled by default.
     if (replacement && versionNumber() >= QVersionNumber(16)
-            && Utils::qtcEnvironmentVariableIsSet("QTC_CLANGD_RENAMING")) {
+            && Utils::qtcEnvironmentVariable("QTC_CLANGD_RENAMING") != "0") {
         symbolSupport().renameSymbol(document, adjustedCursor, *replacement,
                                      CppEditor::preferLowerCaseFileNames());
         return;