diff --git a/src/views/DataView/ResourceDataView.tsx b/src/views/DataView/ResourceDataView.tsx
index e01dfbf..b3ce663 100644
--- a/src/views/DataView/ResourceDataView.tsx
+++ b/src/views/DataView/ResourceDataView.tsx
@@ -121,23 +121,26 @@ export const ResourceDataView = <
   }, [filteredData.length, loaded]);
 
   const dataViewFiltersNodes = React.useMemo<React.ReactNode[]>(() => {
-    const basicFilters = [
-      !hideNameLabelFilters && (
+    const basicFilters = [];
+    if (!hideNameLabelFilters) {
+      basicFilters.push(
         <DataViewTextFilter
           key="name"
           filterId="name"
           title={t("public~Name")}
         />
-      ),
-      !hideNameLabelFilters && hideLabelFilter !== true && (
+      );
+    }
+    if (!hideNameLabelFilters && hideLabelFilter !== true) {
+      basicFilters.push(
         <DataViewLabelFilter
           key="labels"
           filterId="label"
           title={t("public~Label")}
           data={data}
         />
-      ),
-    ];
+      );
+    }
 
     return additionalFilterNodes?.length > 0
       ? [...additionalFilterNodes, ...basicFilters]
@@ -150,12 +153,14 @@ export const ResourceDataView = <
     <DataView activeState={activeState}>
       <DataViewToolbar
         filters={
-          <DataViewFilters
-            values={filters}
-            onChange={(_e, values) => onSetFilters(values)}
-          >
-            {dataViewFiltersNodes}
-          </DataViewFilters>
+          dataViewFiltersNodes.length > 0 && (
+            <DataViewFilters
+              values={filters}
+              onChange={(_e, values) => onSetFilters(values)}
+            >
+              {dataViewFiltersNodes}
+            </DataViewFilters>
+          )
         }
         clearAllFilters={clearAllFilters}
         actions={