diff --git a/src/main/java/com/redhat/devtools/intellij/lsp4ij/LSPIJUtils.java b/src/main/java/com/redhat/devtools/intellij/lsp4ij/LSPIJUtils.java
index 7b32db990..a257a8cfa 100644
--- a/src/main/java/com/redhat/devtools/intellij/lsp4ij/LSPIJUtils.java
+++ b/src/main/java/com/redhat/devtools/intellij/lsp4ij/LSPIJUtils.java
@@ -204,7 +204,7 @@ public static Range toRange(TextRange range, Document document) {
     public static @Nullable TextRange toTextRange(Range range, Document document) {
         final int start = LSPIJUtils.toOffset(range.getStart(), document);
         final int end = LSPIJUtils.toOffset(range.getEnd(), document);
-        if (start >= end) {
+        if (start >= end || end > document.getTextLength()) {
             // Language server reports invalid diagnostic, ignore it.
             return null;
         }