diff --git a/src/tools/clangbackend/source/clangjobrequest.cpp b/src/tools/clangbackend/source/clangjobrequest.cpp
index 93017fc9569..b40ea424257 100644
--- a/src/tools/clangbackend/source/clangjobrequest.cpp
+++ b/src/tools/clangbackend/source/clangjobrequest.cpp
@@ -153,7 +153,7 @@ static JobRequest::RunConditions conditionsForType(JobRequest::Type type)
     Conditions conditions = Conditions(Condition::DocumentUnsuspended)
                           | Conditions(Condition::DocumentVisible);
 
-    if (type == Type::RequestReferences)
+    if (type == Type::RequestReferences || type == Type::FollowSymbol)
         conditions |= Condition::CurrentDocumentRevision;
 
     if (type != Type::UpdateDocumentAnnotations && type != Type::ParseSupportiveTranslationUnit)
diff --git a/tests/unit/unittest/clangcodemodelserver-test.cpp b/tests/unit/unittest/clangcodemodelserver-test.cpp
index 1b2c95c8a1b..36efb1597a8 100644
--- a/tests/unit/unittest/clangcodemodelserver-test.cpp
+++ b/tests/unit/unittest/clangcodemodelserver-test.cpp
@@ -204,7 +204,9 @@ TEST_F(ClangCodeModelServerSlowTest, RequestReferencesTakesRevisionFromMessage)
     requestReferences(/*documentRevision=*/ 99);
 
     JobRequests &queue = documentProcessorForFile(filePathC).queue();
-    Utils::anyOf(queue, [](const JobRequest &request) { return request.documentRevision == 99; });
+    ASSERT_TRUE(Utils::anyOf(queue, [](const JobRequest &request) {
+        return request.documentRevision == 99;
+    }));
     queue.clear(); // Avoid blocking
 }
 
@@ -223,7 +225,9 @@ TEST_F(ClangCodeModelServerSlowTest, RequestFollowSymbolTakesRevisionFromMessage
     requestFollowSymbol(/*documentRevision=*/ 99);
 
     JobRequests &queue = documentProcessorForFile(filePathC).queue();
-    Utils::anyOf(queue, [](const JobRequest &request) { return request.documentRevision == 99; });
+    ASSERT_TRUE(Utils::anyOf(queue, [](const JobRequest &request) {
+        return request.documentRevision == 99;
+    }));
     queue.clear(); // Avoid blocking
 }