diff --git a/org.eclipse.lsp4e/META-INF/MANIFEST.MF b/org.eclipse.lsp4e/META-INF/MANIFEST.MF
index 33c299018..db28dc134 100644
--- a/org.eclipse.lsp4e/META-INF/MANIFEST.MF
+++ b/org.eclipse.lsp4e/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language Server Protocol client for Eclipse IDE (Incubation)
 Bundle-SymbolicName: org.eclipse.lsp4e;singleton:=true
-Bundle-Version: 0.19.6.qualifier
+Bundle-Version: 0.19.7.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.equinox.common;bundle-version="3.8.0",
diff --git a/org.eclipse.lsp4e/pom.xml b/org.eclipse.lsp4e/pom.xml
index 34fa3c984..e379bb9ca 100644
--- a/org.eclipse.lsp4e/pom.xml
+++ b/org.eclipse.lsp4e/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<artifactId>org.eclipse.lsp4e</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>0.19.6-SNAPSHOT</version>
+	<version>0.19.7-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/diagnostics/DiagnosticAnnotation.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/diagnostics/DiagnosticAnnotation.java
index 59604e505..79bd53ddc 100644
--- a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/diagnostics/DiagnosticAnnotation.java
+++ b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/diagnostics/DiagnosticAnnotation.java
@@ -19,6 +19,9 @@
 
 class DiagnosticAnnotation extends Annotation {
 
+	private static final String TYPE_INFO = "org.eclipse.ui.workbench.texteditor.info"; //$NON-NLS-1$
+	private static final String TYPE_WARNING = "org.eclipse.ui.workbench.texteditor.warning"; //$NON-NLS-1$
+	private static final String TYPE_ERROR = "org.eclipse.ui.workbench.texteditor.error"; //$NON-NLS-1$
 	private final Diagnostic diagnostic;
 	private final Function<Diagnostic, String> textComputer;
 
@@ -30,10 +33,11 @@ public DiagnosticAnnotation(Diagnostic diagnostic, Function<Diagnostic, String>
 	@Override
 	public String getType() {
 		return switch (diagnostic.getSeverity()) {
-		case Error -> "org.eclipse.ui.workbench.texteditor.error"; //$NON-NLS-1$
-		case Warning -> "org.eclipse.ui.workbench.texteditor.warning"; //$NON-NLS-1$
-		case Information -> "org.eclipse.ui.workbench.texteditor.info"; //$NON-NLS-1$
-		case Hint -> "org.eclipse.ui.workbench.texteditor.info"; //$NON-NLS-1$
+		case Error -> TYPE_ERROR;
+		case Warning -> TYPE_WARNING;
+		case Information -> TYPE_INFO;
+		case Hint -> TYPE_INFO;
+		case null -> TYPE_ERROR;
 		};
 	}