diff --git a/src/Components/SmartComponents/CVEs/CVEsTableToolbar.js b/src/Components/SmartComponents/CVEs/CVEsTableToolbar.js
index 7047ad846..fb399da50 100644
--- a/src/Components/SmartComponents/CVEs/CVEsTableToolbar.js
+++ b/src/Components/SmartComponents/CVEs/CVEsTableToolbar.js
@@ -87,7 +87,7 @@ const CVEsTableToolbarWithContext = (props) => {
                 }}
                 actionsConfig={{
                     actions,
-                    kebabToggleProps: { isDisabled: !selectedCvesCount || cves.meta.total_items === 0 },
+                    kebabToggleProps: { isDisabled: !selectedCvesCount },
                     dropdownProps: { ouiaId: 'toolbar-actions' }
                 }}
                 bulkSelect={{
diff --git a/src/Components/SmartComponents/SystemCves/SystemCveTableToolbar.js b/src/Components/SmartComponents/SystemCves/SystemCveTableToolbar.js
index 7b2686264..fb8c028ea 100644
--- a/src/Components/SmartComponents/SystemCves/SystemCveTableToolbar.js
+++ b/src/Components/SmartComponents/SystemCves/SystemCveTableToolbar.js
@@ -79,7 +79,7 @@ const SystemCveToolbarWithContext = ({ entity, intl, context }) => {
                 dedicatedAction={(canRemediate && entity && <Remediation systems={entity} cves={selectedCvesData} />)}
                 actionsConfig={{
                     actions,
-                    kebabToggleProps: { isDisabled: !selectedCvesCount || cves.meta.total_items === 0 },
+                    kebabToggleProps: { isDisabled: !selectedCvesCount },
                     dropdownProps: { ouiaId: 'toolbar-actions' }
                 } }
                 bulkSelect={{
diff --git a/src/Components/SmartComponents/SystemsExposedTable/SystemsExposedTable.js b/src/Components/SmartComponents/SystemsExposedTable/SystemsExposedTable.js
index 76e427776..a8b2f507b 100644
--- a/src/Components/SmartComponents/SystemsExposedTable/SystemsExposedTable.js
+++ b/src/Components/SmartComponents/SystemsExposedTable/SystemsExposedTable.js
@@ -262,7 +262,7 @@ const SystemsExposedTable = (props) => {
                             <PrimaryToolbar
                                 className="vuln-systems-primary-toolbar"
                                 exportConfig={{
-                                    isDisabled: items.meta.total_items === 0 && (!selectedHosts || selectedHosts.length === 0),
+                                    isDisabled: items.meta.total_items === 0,
                                     ouiaId: 'export',
                                     ...exportConfig({ downloadReport })
                                 }}
diff --git a/src/Components/SmartComponents/SystemsPage/SystemsTableToolbar.js b/src/Components/SmartComponents/SystemsPage/SystemsTableToolbar.js
index cc30fb87c..3ed45abd5 100644
--- a/src/Components/SmartComponents/SystemsPage/SystemsTableToolbar.js
+++ b/src/Components/SmartComponents/SystemsPage/SystemsTableToolbar.js
@@ -82,7 +82,7 @@ const SystemsTableToolbar = ({
             bulkSelect={bulkSelectProps}
             actionsConfig={{
                 actions: kebabOptions,
-                kebabToggleProps: { isDisabled: !selectedRowsCount || systems.meta.total_items === 0 },
+                kebabToggleProps: { isDisabled: !selectedRowsCount },
                 dropdownProps: { ouiaId: 'toolbar-actions' }
             }}
             filterConfig={{