diff --git a/changes/9129-fix-neverending-spinner b/changes/9129-fix-neverending-spinner
new file mode 100644
index 0000000000..1ee1743398
--- /dev/null
+++ b/changes/9129-fix-neverending-spinner
@@ -0,0 +1 @@
+- Invalid query string will not result in neverending spinner
\ No newline at end of file
diff --git a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
index c6dab52701..1dc5fbcd9b 100644
--- a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
+++ b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
@@ -351,7 +351,7 @@ const ManageHostsPage = ({
     }
   );
 
-  useQuery<IStoredPolicyResponse, Error>(
+  const { isLoading: isLoadingPolicy } = useQuery<IStoredPolicyResponse, Error>(
     ["policy"],
     () => globalPoliciesAPI.load(policyId),
     {
@@ -359,6 +359,9 @@ const ManageHostsPage = ({
       onSuccess: ({ policy: policyAPIResponse }) => {
         setPolicy(policyAPIResponse);
       },
+      onError: () => {
+        setHasHostErrors(true);
+      },
     }
   );
 
@@ -1647,7 +1650,14 @@ const ManageHostsPage = ({
   };
 
   const renderTable = () => {
-    if (!config || !currentUser || !hosts || !teamSync) {
+    if (
+      !config ||
+      !currentUser ||
+      isHostCountLoading ||
+      isHostsLoading ||
+      isLoadingPolicy ||
+      !teamSync
+    ) {
       return <Spinner />;
     }
 
@@ -1755,7 +1765,7 @@ const ManageHostsPage = ({
     return (
       <TableContainer
         columns={tableColumns}
-        data={hosts}
+        data={hosts || []}
         isLoading={isHostsLoading || isHostCountLoading}
         manualSortBy
         defaultSortHeader={(sortBy[0] && sortBy[0].key) || DEFAULT_SORT_HEADER}