diff --git a/extensions/css-language-features/client/src/cssMain.ts b/extensions/css-language-features/client/src/cssMain.ts
index c587c0a5a875feededfe2a5f69b0bb55f13a8166..a7a031bda3c284cc5a7f6fe999569a09738e54d0 100644
--- a/extensions/css-language-features/client/src/cssMain.ts
+++ b/extensions/css-language-features/client/src/cssMain.ts
@@ -27,14 +27,7 @@ export function activate(context: ExtensionContext) {
 		debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions }
 	};
 
-	let documentSelector = [
-		{ language: 'css', scheme: 'file' },
-		{ language: 'css', scheme: 'untitled' },
-		{ language: 'scss', scheme: 'file' },
-		{ language: 'scss', scheme: 'untitled' },
-		{ language: 'less', scheme: 'file' },
-		{ language: 'less', scheme: 'untitled' },
-	];
+	let documentSelector = ['css', 'scss', 'less'];
 
 	// Options to control the language client
 	let clientOptions: LanguageClientOptions = {
diff --git a/extensions/html-language-features/client/src/htmlMain.ts b/extensions/html-language-features/client/src/htmlMain.ts
index 021a4aa625e161dea6ec031fcb5d5c986874a373..313542681127d24445f3f4a8ad0dab524ed0f2d9 100644
--- a/extensions/html-language-features/client/src/htmlMain.ts
+++ b/extensions/html-language-features/client/src/htmlMain.ts
@@ -47,14 +47,7 @@ export function activate(context: ExtensionContext) {
 		debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions }
 	};
 
-	let documentSelector = [
-		{ language: 'html', scheme: 'file' },
-		{ language: 'html', scheme: 'untitled' },
-		{ language: 'handlebars', scheme: 'file' },
-		{ language: 'handlebars', scheme: 'untitled' },
-		{ language: 'razor', scheme: 'file' },
-		{ language: 'razor', scheme: 'untitled' }
-	];
+	let documentSelector = ['html', 'handlebars', 'razor'];
 	let embeddedLanguages = { css: true, javascript: true };
 
 	// Options to control the language client
diff --git a/extensions/html-language-features/server/src/htmlServerMain.ts b/extensions/html-language-features/server/src/htmlServerMain.ts
index 8c6babddedbec5d5cce285fb3197a020bb0e83ae..7e9253c83e60e92754ad9c361fdf96e417c26e81 100644
--- a/extensions/html-language-features/server/src/htmlServerMain.ts
+++ b/extensions/html-language-features/server/src/htmlServerMain.ts
@@ -171,12 +171,7 @@ connection.onDidChangeConfiguration((change) => {
 		let enableFormatter = globalSettings && globalSettings.html && globalSettings.html.format && globalSettings.html.format.enable;
 		if (enableFormatter) {
 			if (!formatterRegistration) {
-				let documentSelector: DocumentSelector = [
-					{ language: 'html', scheme: 'file' },
-					{ language: 'html', scheme: 'untitled' },
-					{ language: 'handlebars', scheme: 'file' },
-					{ language: 'handlebars', scheme: 'untitled' }
-				]; // don't register razor, the formatter does more harm than good
+				let documentSelector: DocumentSelector = [{ language: 'html' }, { language: 'handlebars' }]; // don't register razor, the formatter does more harm than good
 				formatterRegistration = connection.client.register(DocumentRangeFormattingRequest.type, { documentSelector });
 			}
 		} else if (formatterRegistration) {