diff --git a/src/services/search/services/search.js b/src/services/search/services/search.js
index beb0555d1..d682af090 100644
--- a/src/services/search/services/search.js
+++ b/src/services/search/services/search.js
@@ -299,7 +299,9 @@ function highlightSearchResults(searchResults, highlightedTokens) {
     // which would make the resulting HTML string invalid.
     // { and } are used for marking <b> and </b> tag (to avoid matches on single 'b' character)
     // < and > are used for marking <small> and </small>
-    highlightedTokens = highlightedTokens.map(token => token.replace('/[<\{\}]/g', ''));
+    highlightedTokens = highlightedTokens
+        .map(token => token.replace('/[<\{\}]/g', ''))
+        .filter(token => !!token?.trim());
 
     // sort by the longest, so we first highlight the longest matches
     highlightedTokens.sort((a, b) => a.length > b.length ? -1 : 1);