diff --git a/ui-common/src/components/UI/Queryable.tsx b/ui-common/src/components/UI/Queryable.tsx
index b38cfa1d3..e7773d227 100644
--- a/ui-common/src/components/UI/Queryable.tsx
+++ b/ui-common/src/components/UI/Queryable.tsx
@@ -54,7 +54,7 @@ const Queryable: React.FC<Props> = ({query, style, iconStyle, className, useTool
                 {flipped && addButton}
                 {children}
                 {!flipped && addButton}
-                {useTooltip && showTooltip && <span data-cy={"QueryableTooltip"} className={QueryableStyle.QueryableTooltip} style={tooltipStyle}>{query}</span>}
+                {useTooltip && showTooltip && (query !== "") && <span data-cy={"QueryableTooltip"} className={QueryableStyle.QueryableTooltip} style={tooltipStyle}>{query}</span>}
         </div>
     );
 };