diff --git a/src/containers/Storage/PaginatedStorageGroups.tsx b/src/containers/Storage/PaginatedStorageGroups.tsx
index d3141622f3..03735f3e16 100644
--- a/src/containers/Storage/PaginatedStorageGroups.tsx
+++ b/src/containers/Storage/PaginatedStorageGroups.tsx
@@ -60,6 +60,8 @@ function StorageGroupsComponent({
 }: PaginatedStorageProps) {
     const {searchValue, visibleEntities, handleShowAllGroups} = useStorageQueryParams();
 
+    const storageGroupsHandlerHasGroupping = useStorageGroupsHandlerHasGrouping();
+
     const {columnsToShow, columnsToSelect, setColumns} = useStorageGroupsSelectedColumns({
         visibleEntities,
         viewContext,
@@ -69,7 +71,7 @@ function StorageGroupsComponent({
         return (
             <StorageGroupsControls
                 withTypeSelector
-                withGroupBySelect
+                withGroupBySelect={storageGroupsHandlerHasGroupping}
                 entitiesCountCurrent={foundEntities}
                 entitiesCountTotal={totalEntities}
                 entitiesLoading={!inited}
diff --git a/src/containers/Storage/PaginatedStorageNodes.tsx b/src/containers/Storage/PaginatedStorageNodes.tsx
index 472cdd54b8..df496b73ab 100644
--- a/src/containers/Storage/PaginatedStorageNodes.tsx
+++ b/src/containers/Storage/PaginatedStorageNodes.tsx
@@ -68,6 +68,8 @@ function StorageNodesComponent({
     const {searchValue, visibleEntities, nodesUptimeFilter, handleShowAllNodes} =
         useStorageQueryParams();
 
+    const viewerNodesHandlerHasGrouping = useViewerNodesHandlerHasGrouping();
+
     const {columnsToShow, columnsToSelect, setColumns} = useStorageNodesColumnsToSelect({
         database,
         viewContext,
@@ -77,7 +79,7 @@ function StorageNodesComponent({
         return (
             <StorageNodesControls
                 withTypeSelector
-                withGroupBySelect
+                withGroupBySelect={viewerNodesHandlerHasGrouping}
                 entitiesCountCurrent={foundEntities}
                 entitiesCountTotal={totalEntities}
                 entitiesLoading={!inited}