diff --git a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
index a73fcb8e3..85351652f 100644
--- a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
+++ b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
@@ -209,8 +209,7 @@ public class Editor {
 
 
 	public List<Range> assertHighlights(String... expectedHighlights) throws Exception {
-		HighlightParams highlights = expectedHighlights == null || expectedHighlights.length == 0 ? harness.getHighlights(false, doc)
-				: harness.getHighlights(doc);
+		HighlightParams highlights = harness.getHighlights(doc);
 		List<Range> ranges = highlights != null ? new ArrayList<>(highlights.getRanges()) : ImmutableList.of();
 		Collections.sort(ranges, RANGE_COMPARATOR);
 		List<String> actualHighlights = ranges.stream()
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveHoverWatchdog.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveHoverWatchdog.java
index d9c001ceb..d460d6ecb 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveHoverWatchdog.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveHoverWatchdog.java
@@ -49,7 +49,6 @@ public class SpringLiveHoverWatchdog {
 	private RunningAppProvider runningAppProvider;
 
 	private boolean highlightsEnabled = true;
-	private boolean hadPreviousRunningBootApps = false;
 
 	private Timer timer;
 
@@ -157,17 +156,9 @@ public class SpringLiveHoverWatchdog {
 						publishLiveHints(docURI, ranges);
 					}
 				}
-				else if (this.hadPreviousRunningBootApps) {
-					// PT 156688501:
-					// Only clean up live hovers if there were running boot apps in the previous
-					// update, but not
-					// in the current one.
-					// This is to avoid unnecessary publishing of live hovers when there have been
-					// no running apps
-					// at all between consecutive updates.
+				else  {
 					cleanupLiveHints(docURI);
 				}
-				this.hadPreviousRunningBootApps = hasCurrentRunningBootApps;
 			} catch (Exception e) {
 				logger.error("", e);
 			}