diff --git a/vscode-extensions/commons-vscode/src/highlight-service.ts b/vscode-extensions/commons-vscode/src/highlight-service.ts
index 3db7283bf..797902b18 100644
--- a/vscode-extensions/commons-vscode/src/highlight-service.ts
+++ b/vscode-extensions/commons-vscode/src/highlight-service.ts
@@ -62,7 +62,7 @@ export class HighlightService {
     private updateHighlightsForEditor(editor: TextEditor) {
         if (editor) {
             const highlightParams: HighlightParams = this.highlights.get(editor.document.uri.toString());
-            const highlights: CodeLens[] = highlightParams.codeLenses || [];
+            const highlights: CodeLens[] = highlightParams?.codeLenses || [];
             let decorations = highlights.map(hl => toVSRange(hl.range));
             editor.setDecorations(this.DECORATION, decorations);
         }