diff --git a/extensions/css/server/package.json b/extensions/css/server/package.json
index 7f71131e6bf0238f3bceca63d56a27d94e41d24e..e247162733023c9911eed495b7043ad3238c5a8f 100644
--- a/extensions/css/server/package.json
+++ b/extensions/css/server/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "vscode-css-languageservice": "^3.0.6",
-    "vscode-emmet-helper": "^1.1.37",
+    "vscode-emmet-helper": "^1.1.38",
     "vscode-languageserver": "4.0.0-next.4"
   },
   "devDependencies": {
diff --git a/extensions/css/server/src/cssServerMain.ts b/extensions/css/server/src/cssServerMain.ts
index 0a63d245559d34b9008e75b9aa10867c2629d7fe..6b7477305cf63f6ee8a988107ef8e97c14c64008 100644
--- a/extensions/css/server/src/cssServerMain.ts
+++ b/extensions/css/server/src/cssServerMain.ts
@@ -215,8 +215,8 @@ connection.onCompletion(textDocumentPosition => {
 
 		cachedCompletionList = null;
 		let emmetCompletionList: CompletionList = {
-			isIncomplete: true,
-			items: undefined
+			isIncomplete: false,
+			items: []
 		};
 		const emmetCompletionParticipant: ICompletionParticipant = getEmmetCompletionParticipants(document, textDocumentPosition.position, document.languageId, emmetSettings, emmetCompletionList);
 		getLanguageService(document).setCompletionParticipants([emmetCompletionParticipant]);
@@ -227,7 +227,7 @@ connection.onCompletion(textDocumentPosition => {
 			if (emmetCompletionList.items.length && hexColorRegex.test(emmetCompletionList.items[0].label) && result.items.some(x => x.label === emmetCompletionList.items[0].label)) {
 				emmetCompletionList.items.shift();
 			}
-			return { isIncomplete: true, items: [...emmetCompletionList.items, ...result.items] };
+			return { isIncomplete: emmetCompletionList.isIncomplete || result.isIncomplete, items: [...emmetCompletionList.items, ...result.items] };
 		}
 		return result;
 	}, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`);
diff --git a/extensions/css/server/yarn.lock b/extensions/css/server/yarn.lock
index fb9ea3236370c851bf12fc302a5ed3e7903ec781..495deb4b73a081f662b1772b1ed7541e6526b0ce 100644
--- a/extensions/css/server/yarn.lock
+++ b/extensions/css/server/yarn.lock
@@ -25,9 +25,9 @@ vscode-css-languageservice@^3.0.6:
     vscode-languageserver-types "^3.6.0-next.1"
     vscode-nls "^2.0.1"
 
-vscode-emmet-helper@^1.1.37:
-  version "1.1.37"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.37.tgz#239636ec559d98b23994394028dd1535f49e8a53"
+vscode-emmet-helper@^1.1.38:
+  version "1.1.38"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.38.tgz#6b7de1abe39f8b41d4713c4e85ace4a7261ef0d8"
   dependencies:
     "@emmetio/extract-abbreviation" "0.1.6"
     jsonc-parser "^1.0.0"
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index d704fb39b4f5ca474c7c1c48d7caa326e08eebdb..3d1702b8565ba1f23227b25078ef8eb9309b9f64 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -337,7 +337,7 @@
         "@emmetio/html-matcher": "^0.3.3",
         "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
         "@emmetio/math-expression": "^0.1.1",
-        "vscode-emmet-helper": "^1.1.37",
+        "vscode-emmet-helper": "^1.1.38",
         "vscode-languageserver-types": "^3.5.0",
         "image-size": "^0.5.2",
         "vscode-nls": "3.2.1"
diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock
index 89b32d0ba9680c24b28a5aec2ff53e9349decf1a..76ab5219705f88b6023a0409e6e286508b358d0d 100644
--- a/extensions/emmet/yarn.lock
+++ b/extensions/emmet/yarn.lock
@@ -2052,9 +2052,9 @@ vinyl@~2.0.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vscode-emmet-helper@^1.1.37:
-  version "1.1.37"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.37.tgz#239636ec559d98b23994394028dd1535f49e8a53"
+vscode-emmet-helper@^1.1.38:
+  version "1.1.38"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.38.tgz#6b7de1abe39f8b41d4713c4e85ace4a7261ef0d8"
   dependencies:
     "@emmetio/extract-abbreviation" "0.1.6"
     jsonc-parser "^1.0.0"
diff --git a/extensions/html/server/package.json b/extensions/html/server/package.json
index 91553664578af99c50279daa32786524f54077bc..f582578707d938f22ac273059e0ed22d39c633c1 100644
--- a/extensions/html/server/package.json
+++ b/extensions/html/server/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "vscode-css-languageservice": "^3.0.6",
-    "vscode-emmet-helper": "^1.1.37",
+    "vscode-emmet-helper": "1.1.38",
     "vscode-html-languageservice": "^2.0.17-next.3",
     "vscode-languageserver": "4.0.0-next.4",
     "vscode-languageserver-types": "^3.6.0-next.1",
diff --git a/extensions/html/server/src/htmlServerMain.ts b/extensions/html/server/src/htmlServerMain.ts
index 33e7e335e3aa8058a2ced5a92441fd6a1a76381a..184c0e77c474b5967ed097e14e13b0985cd80368 100644
--- a/extensions/html/server/src/htmlServerMain.ts
+++ b/extensions/html/server/src/htmlServerMain.ts
@@ -276,8 +276,8 @@ connection.onCompletion(async textDocumentPosition => {
 
 		cachedCompletionList = null;
 		let emmetCompletionList: CompletionList = {
-			isIncomplete: true,
-			items: undefined
+			isIncomplete: false,
+			items: []
 		};
 		let pathCompletionList: CompletionList = {
 			isIncomplete: false,
@@ -305,7 +305,7 @@ connection.onCompletion(async textDocumentPosition => {
 			if (emmetCompletionList.items.length && hexColorRegex.test(emmetCompletionList.items[0].label) && result.items.some(x => x.label === emmetCompletionList.items[0].label)) {
 				emmetCompletionList.items.shift();
 			}
-			return { isIncomplete: true, items: [...emmetCompletionList.items, ...result.items] };
+			return { isIncomplete: emmetCompletionList.isIncomplete || result.isIncomplete, items: [...emmetCompletionList.items, ...result.items] };
 		}
 		return result;
 
diff --git a/extensions/html/server/yarn.lock b/extensions/html/server/yarn.lock
index 43f3d47cf2de8214c293644112297cf5b4fe2065..298ecf5c6ba7696ea4acbdb53f917967793729c9 100644
--- a/extensions/html/server/yarn.lock
+++ b/extensions/html/server/yarn.lock
@@ -25,9 +25,9 @@ vscode-css-languageservice@^3.0.6:
     vscode-languageserver-types "^3.6.0-next.1"
     vscode-nls "^2.0.1"
 
-vscode-emmet-helper@^1.1.37:
-  version "1.1.37"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.37.tgz#239636ec559d98b23994394028dd1535f49e8a53"
+vscode-emmet-helper@1.1.38:
+  version "1.1.38"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.38.tgz#6b7de1abe39f8b41d4713c4e85ace4a7261ef0d8"
   dependencies:
     "@emmetio/extract-abbreviation" "0.1.6"
     jsonc-parser "^1.0.0"