diff --git a/packages/insomnia-app/app/ui/components/codemirror/extensions/autocomplete.js b/packages/insomnia-app/app/ui/components/codemirror/extensions/autocomplete.js
index 280cde7d0b..bd5bdd8cd0 100644
--- a/packages/insomnia-app/app/ui/components/codemirror/extensions/autocomplete.js
+++ b/packages/insomnia-app/app/ui/components/codemirror/extensions/autocomplete.js
@@ -414,15 +414,14 @@ function renderHintMatch(li, self, data) {
   const markedName = replaceWithSurround(displayText, segment, '<strong>', '</strong>');
 
   const { char, title } = ICONS[data.type];
+  const safeValue = escapeHTML(data.displayValue);
 
-  let html = `
+  li.className += ` fancy-hint type--${data.type}`;
+  li.innerHTML = `
     <label class="label" title="${title}">${char}</label>
     <div class="name">${markedName}</div>
-    <div class="value" title=${data.displayValue}>
-      ${escapeHTML(data.displayValue || '')}
+    <div class="value" title=${safeValue}>
+      ${safeValue}
     </div>
   `;
-
-  li.innerHTML = html;
-  li.className += ` fancy-hint type--${data.type}`;
 }