diff --git a/public/app/percona/inventory/Tabs/Services/Clusters.tsx b/public/app/percona/inventory/Tabs/Services/Clusters.tsx
index 4822045ea4979..3329b15b90279 100644
--- a/public/app/percona/inventory/Tabs/Services/Clusters.tsx
+++ b/public/app/percona/inventory/Tabs/Services/Clusters.tsx
@@ -15,7 +15,7 @@ const Clusters: FC<ClustersProps> = ({ services, onDelete, onSelectionChange })
   const [filtered, setFiltered] = useState(services);
   const clusters = useMemo(() => getClustersFromServices(filtered), [filtered]);
   const [selection, setSelection] = useState({});
-  const filterEnabled = filtered !== services;
+  const [filterEnabled, setFilterEnabled] = useState(false);
 
   const handleSelectionChange = useCallback(
     (cluster: ServicesCluster, selectedServices: Array<Row<FlattenService>>) => {
@@ -31,9 +31,13 @@ const Clusters: FC<ClustersProps> = ({ services, onDelete, onSelectionChange })
     [onSelectionChange]
   );
 
-  const handleFiltering = useCallback((rows: FlattenService[]) => {
-    setFiltered(rows);
-  }, []);
+  const handleFiltering = useCallback(
+    (rows: FlattenService[]) => {
+      setFilterEnabled(rows !== services);
+      setFiltered(rows);
+    },
+    [services]
+  );
 
   return (
     <div>
diff --git a/public/app/percona/inventory/Tabs/Services/ServicesTable.tsx b/public/app/percona/inventory/Tabs/Services/ServicesTable.tsx
index 7f28e278e66b8..ed21df7ec817e 100644
--- a/public/app/percona/inventory/Tabs/Services/ServicesTable.tsx
+++ b/public/app/percona/inventory/Tabs/Services/ServicesTable.tsx
@@ -223,6 +223,7 @@ const ServicesTable: FC<ServicesTableProps> = ({
       getRowId={useCallback((row: FlattenService) => row.serviceId, [])}
       showFilter
       tableKey={tableKey}
+      autoResetExpanded={false}
     />
   );
 };