diff --git a/plugins/adr/src/search/AdrSearchResultListItem.tsx b/plugins/adr/src/search/AdrSearchResultListItem.tsx
index f7d9bcbe57..97847ba67b 100644
--- a/plugins/adr/src/search/AdrSearchResultListItem.tsx
+++ b/plugins/adr/src/search/AdrSearchResultListItem.tsx
@@ -70,19 +70,17 @@ export function AdrSearchResultListItem(props: {
           className={classes.itemText}
           primaryTypographyProps={{ variant: 'h6' }}
           primary={
-            highlight?.fields.title ? (
-              <Link noTrack to={result.location} onClick={handleClick}>
+            <Link noTrack to={result.location} onClick={handleClick}>
+              {highlight?.fields.title ? (
                 <HighlightedSearchResultText
-                  text={highlight.fields.title}
-                  preTag={highlight.preTag}
-                  postTag={highlight.postTag}
+                  text={highlight?.fields.title || ''}
+                  preTag={highlight?.preTag || ''}
+                  postTag={highlight?.postTag || ''}
                 />
-              </Link>
-            ) : (
-              <Link noTrack to={result.location} onClick={handleClick}>
-                {result.title}
-              </Link>
-            )
+              ) : (
+                result.title
+              )}
+            </Link>
           }
           secondary={
             <span
diff --git a/plugins/catalog/src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.tsx b/plugins/catalog/src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.tsx
index 27f0698f8d..2e5cbe2899 100644
--- a/plugins/catalog/src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.tsx
+++ b/plugins/catalog/src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.tsx
@@ -60,6 +60,7 @@ export function CatalogSearchResultListItem(
   props: CatalogSearchResultListItemProps,
 ) {
   const result = props.result as any;
+  const highlight = props.highlight as ResultHighlight;
 
   const classes = useStyles();
   const analytics = useAnalytics();
@@ -79,26 +80,24 @@ export function CatalogSearchResultListItem(
             className={classes.itemText}
             primaryTypographyProps={{ variant: 'h6' }}
             primary={
-              props.highlight?.fields.title ? (
-                <Link noTrack to={result.location} onClick={handleClick}>
+              <Link noTrack to={result.location} onClick={handleClick}>
+                {highlight?.fields.title ? (
                   <HighlightedSearchResultText
-                    text={props.highlight.fields.title}
-                    preTag={props.highlight.preTag}
-                    postTag={props.highlight.postTag}
+                    text={highlight.fields.title}
+                    preTag={highlight.preTag}
+                    postTag={highlight.postTag}
                   />
-                </Link>
-              ) : (
-                <Link noTrack to={result.location} onClick={handleClick}>
-                  {result.title}
-                </Link>
-              )
+                ) : (
+                  result.title
+                )}
+              </Link>
             }
             secondary={
-              props.highlight?.fields.text ? (
+              highlight?.fields.text ? (
                 <HighlightedSearchResultText
-                  text={props.highlight.fields.text}
-                  preTag={props.highlight.preTag}
-                  postTag={props.highlight.postTag}
+                  text={highlight.fields.text}
+                  preTag={highlight.preTag}
+                  postTag={highlight.postTag}
                 />
               ) : (
                 result.text
diff --git a/plugins/search-react/src/components/DefaultResultListItem/DefaultResultListItem.tsx b/plugins/search-react/src/components/DefaultResultListItem/DefaultResultListItem.tsx
index 44c83fe5d5..830cb61780 100644
--- a/plugins/search-react/src/components/DefaultResultListItem/DefaultResultListItem.tsx
+++ b/plugins/search-react/src/components/DefaultResultListItem/DefaultResultListItem.tsx
@@ -72,19 +72,17 @@ export const DefaultResultListItemComponent = ({
         <ListItemText
           primaryTypographyProps={{ variant: 'h6' }}
           primary={
-            highlight?.fields.title ? (
-              <Link noTrack to={result.location} onClick={handleClick}>
+            <Link noTrack to={result.location} onClick={handleClick}>
+              {highlight?.fields.title ? (
                 <HighlightedSearchResultText
-                  text={highlight.fields.title}
-                  preTag={highlight.preTag}
-                  postTag={highlight.postTag}
+                  text={highlight?.fields.title || ''}
+                  preTag={highlight?.preTag || ''}
+                  postTag={highlight?.postTag || ''}
                 />
-              </Link>
-            ) : (
-              <Link noTrack to={result.location} onClick={handleClick}>
-                {result.title}
-              </Link>
-            )
+              ) : (
+                result.title
+              )}
+            </Link>
           }
           secondary={
             <span
diff --git a/plugins/techdocs/src/search/components/TechDocsSearchResultListItem.tsx b/plugins/techdocs/src/search/components/TechDocsSearchResultListItem.tsx
index 6ae9f12cef..c7755e8733 100644
--- a/plugins/techdocs/src/search/components/TechDocsSearchResultListItem.tsx
+++ b/plugins/techdocs/src/search/components/TechDocsSearchResultListItem.tsx
@@ -126,13 +126,15 @@ export const TechDocsSearchResultListItem = (
         className={classes.itemText}
         primaryTypographyProps={{ variant: 'h6' }}
         primary={
-          title ? (
-            <LinkWrapper>{title}</LinkWrapper>
-          ) : (
-            <LinkWrapper>
-              {resultTitle} | {entityTitle ?? resultName} docs
-            </LinkWrapper>
-          )
+          <LinkWrapper>
+            {title ? (
+              title
+            ) : (
+              <>
+                {resultTitle} | {entityTitle ?? resultName} docs
+              </>
+            )}
+          </LinkWrapper>
         }
         secondary={
           <span