diff --git a/frontend/pages/queries/details/components/NoResults/NoResults.tsx b/frontend/pages/queries/details/components/NoResults/NoResults.tsx
index 1f105ca493..c3f07b6de1 100644
--- a/frontend/pages/queries/details/components/NoResults/NoResults.tsx
+++ b/frontend/pages/queries/details/components/NoResults/NoResults.tsx
@@ -66,14 +66,18 @@ const NoResults = ({
     // In order of empty page priority
     if (disabledCaching) {
       const tipContent = () => {
+        // TODO - change to JSX with refactor tooltipwrapper merge
         if (disabledCachingGlobally) {
-          return "The following setting prevents saving this query's results in Fleet:<ul><li>Query reports are globally disabled in organization settings.</li></ul>";
+          return `<div>The following setting prevents saving this query's results in Fleet:</div>\
+             <div>&nbsp; • Query reports are globally disabled in organization settings.</div>`;
         }
         if (discardDataEnabled) {
-          return "The following setting prevents saving this query's results in Fleet:<ul><li>This query has Discard data enabled.</li></ul>";
+          return `<div>The following setting prevents saving this query's results in Fleet:</div>\
+         <div>&nbsp; • This query has <b>Discard data</b> enabled.</div>`;
         }
         if (!loggingSnapshot) {
-          return "The following setting prevents saving this query's results in Fleet:<ul><li>The logging setting for this query is not Snapshot.</li></ul>";
+          return `<div>The following setting prevents saving this query's results in Fleet:</div>\
+          <div>&nbsp; • The logging setting for this query is not <b>Snapshot</b>.</div>`;
         }
         return "Unknown";
       };
diff --git a/frontend/pages/queries/details/components/NoResults/_styles.scss b/frontend/pages/queries/details/components/NoResults/_styles.scss
new file mode 100644
index 0000000000..09fad9f2c0
--- /dev/null
+++ b/frontend/pages/queries/details/components/NoResults/_styles.scss
@@ -0,0 +1,9 @@
+.no-results {
+  .component__tooltip-wrapper {
+    &__tip-text {
+      display: flex;
+      flex-direction: column;
+      gap: $pad-xsmall;
+    }
+  }
+}