diff --git a/src/plugins/qmljseditor/qmljseditordocument.cpp b/src/plugins/qmljseditor/qmljseditordocument.cpp
index 72b41700016..91c0fba3b43 100644
--- a/src/plugins/qmljseditor/qmljseditordocument.cpp
+++ b/src/plugins/qmljseditor/qmljseditordocument.cpp
@@ -732,11 +732,10 @@ void QmlJSEditorDocumentPrivate::setSourcesWithCapabilities(
         setSemanticWarningSource(QmllsStatus::Source::Qmlls);
     else
         setSemanticWarningSource(QmllsStatus::Source::EmbeddedCodeModel);
-    // TODO: uncomment when qmlls semantic tokens reach a stable state
-    // if (cap.semanticTokensProvider())
-    //     setSemanticHighlightSource(QmllsStatus::Source::Qmlls);
-    // else
-    setSemanticHighlightSource(QmllsStatus::Source::EmbeddedCodeModel);
+    if (cap.semanticTokensProvider())
+        setSemanticHighlightSource(QmllsStatus::Source::Qmlls);
+    else
+        setSemanticHighlightSource(QmllsStatus::Source::EmbeddedCodeModel);
 }
 
 static FilePath qmllsForFile(const FilePath &file, QmlJS::ModelManagerInterface *modelManager)
diff --git a/src/plugins/qmljseditor/qmllsclient.cpp b/src/plugins/qmljseditor/qmllsclient.cpp
index ce72cf7977c..bb5195ce91d 100644
--- a/src/plugins/qmljseditor/qmllsclient.cpp
+++ b/src/plugins/qmljseditor/qmllsclient.cpp
@@ -85,11 +85,6 @@ QmllsClient::~QmllsClient()
 
 void QmllsClient::startImpl()
 {
-    LanguageServerProtocol::Unregistration unregister;
-    unregister.setMethod("textDocument/semanticTokens");
-    unregister.setId({});
-    dynamicCapabilities().unregisterCapability({unregister});
-
     Client::startImpl();
 }