diff --git a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
index 1dc5fbcd9b..795a6c6bce 100644
--- a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
+++ b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
@@ -550,8 +550,9 @@ const ManageHostsPage = ({
       retrieveHostCount(omit(options, "device_mapping"));
       setCurrentQueryOptions(options);
     }
-
-    setFilteredHostsPath(location.pathname + location.search);
+    if (!location.search.includes("software_id")) {
+      setFilteredHostsPath(location.pathname + location.search);
+    }
   }, [availableTeams, currentTeam, location, labels]);
 
   const isLastPage =