diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index 5b3b9fc783d..0ca9af11a0d 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -207,15 +207,15 @@ ClangModelManagerSupport::ClangModelManagerSupport()
     cppModelManager()->setFunctionsFilter(std::make_unique<ClangFunctionsFilter>());
     // Setup matchers
     LocatorMatcher::addMatcherCreator(MatcherType::AllSymbols, [] {
-        return LanguageClient::workspaceMatchers(clientsForOpenProjects(), MatcherType::AllSymbols,
+        return LanguageClient::workspaceMatchers(MatcherType::AllSymbols, clientsForOpenProjects(),
                                                  10000);
     });
     LocatorMatcher::addMatcherCreator(MatcherType::Classes, [] {
-        return LanguageClient::workspaceMatchers(clientsForOpenProjects(), MatcherType::Classes,
+        return LanguageClient::workspaceMatchers(MatcherType::Classes, clientsForOpenProjects(),
                                                  10000);
     });
     LocatorMatcher::addMatcherCreator(MatcherType::Functions, [] {
-        return LanguageClient::workspaceMatchers(clientsForOpenProjects(), MatcherType::Functions,
+        return LanguageClient::workspaceMatchers(MatcherType::Functions, clientsForOpenProjects(),
                                                  10000);
     });
 
diff --git a/src/plugins/languageclient/locatorfilter.cpp b/src/plugins/languageclient/locatorfilter.cpp
index 324a1cec338..55aca73b819 100644
--- a/src/plugins/languageclient/locatorfilter.cpp
+++ b/src/plugins/languageclient/locatorfilter.cpp
@@ -119,7 +119,7 @@ static MatcherCreator creatorForType(MatcherType type)
     return {};
 }
 
-LocatorMatcherTasks workspaceMatchers(const QList<Client *> &clients, MatcherType type,
+LocatorMatcherTasks workspaceMatchers(MatcherType type, const QList<Client *> &clients,
                                       int maxResultCount)
 {
     const MatcherCreator creator = creatorForType(type);
diff --git a/src/plugins/languageclient/locatorfilter.h b/src/plugins/languageclient/locatorfilter.h
index 52445e19c38..f3c48542560 100644
--- a/src/plugins/languageclient/locatorfilter.h
+++ b/src/plugins/languageclient/locatorfilter.h
@@ -22,9 +22,8 @@ namespace LanguageClient {
 using DocSymbolModifier = std::function<void(Core::LocatorFilterEntry &,
     const LanguageServerProtocol::DocumentSymbol &, const Core::LocatorFilterEntry &)>;
 
-Core::LocatorMatcherTasks LANGUAGECLIENT_EXPORT workspaceMatchers(const QList<Client *> &clients,
-                                                                  Core::MatcherType type,
-                                                                  int maxResultCount = 0);
+Core::LocatorMatcherTasks LANGUAGECLIENT_EXPORT workspaceMatchers(Core::MatcherType type,
+    const QList<Client *> &clients = {}, int maxResultCount = 0);
 
 class LanguageClientManager;