diff --git a/src/vs/workbench/services/search/common/searchService.ts b/src/vs/workbench/services/search/common/searchService.ts
index 392e7eb4a6f705fe81d86948f14c87305f367e41..2471bd110a9fdc85843fb770c3a2fa8a5706469c 100644
--- a/src/vs/workbench/services/search/common/searchService.ts
+++ b/src/vs/workbench/services/search/common/searchService.ts
@@ -206,13 +206,15 @@ export class SearchService extends Disposable implements ISearchService {
 			if (!provider && scheme === Schemas.file) {
 				diskSearchQueries.push(...schemeFQs);
 			} else {
-				if (!provider && scheme !== Schemas.vscodeRemote) {
-					console.warn(`No search provider registered for scheme: ${scheme}`);
-					return;
-				}
+				if (!provider) {
+					if (scheme !== Schemas.vscodeRemote) {
+						console.warn(`No search provider registered for scheme: ${scheme}`);
+						return;
+					}
 
-				console.warn(`No search provider registered for scheme: ${scheme}, waiting`);
-				provider = await this.waitForProvider(query.type, scheme);
+					console.warn(`No search provider registered for scheme: ${scheme}, waiting`);
+					provider = await this.waitForProvider(query.type, scheme);
+				}
 
 				const oneSchemeQuery: ISearchQuery = {
 					...query,