diff --git a/src/vs/editor/contrib/hover/modesContentHover.ts b/src/vs/editor/contrib/hover/modesContentHover.ts
index 00ec6881e85..4e93efdcb96 100644
--- a/src/vs/editor/contrib/hover/modesContentHover.ts
+++ b/src/vs/editor/contrib/hover/modesContentHover.ts
@@ -295,7 +295,8 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 		// update column from which to show
 		var renderColumn = Number.MAX_VALUE,
 			highlightRange = messages[0].range,
-			fragment = document.createDocumentFragment();
+			fragment = document.createDocumentFragment(),
+			isEmptyHoverContent = true;
 
 		let containColorPicker = false;
 		messages.forEach((msg) => {
@@ -312,6 +313,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 					.forEach(contents => {
 						const renderedContents = this._markdownRenderer.render(contents);
 						fragment.appendChild($('div.hover-row', null, renderedContents));
+						isEmptyHoverContent = false;
 					});
 			} else {
 				containColorPicker = true;
@@ -392,7 +394,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 
 		// show
 
-		if (!containColorPicker) {
+		if (!containColorPicker && !isEmptyHoverContent) {
 			this.showAt(new Position(renderRange.startLineNumber, renderColumn), this._shouldFocus);
 			this.updateContents(fragment);
 		}