diff --git a/src/components/CippTable/CIPPTableToptoolbar.js b/src/components/CippTable/CIPPTableToptoolbar.js
index caad18cd9a7c..bbbc942a0853 100644
--- a/src/components/CippTable/CIPPTableToptoolbar.js
+++ b/src/components/CippTable/CIPPTableToptoolbar.js
@@ -74,6 +74,10 @@ export const CIPPTableToptoolbar = ({
   const handleActionMenuOpen = (event) => setActionMenuAnchor(event.currentTarget);
   const handleActionMenuClose = () => setActionMenuAnchor(null);
 
+  const getBulkActions = (actions) => {
+    return actions?.filter((action) => !action.link && !action?.hideBulk) || [];
+  };
+
   useEffect(() => {
     //if usedData changes, deselect all rows
     table.toggleAllRowsSelected(false);
@@ -486,7 +490,7 @@ export const CIPPTableToptoolbar = ({
                 <SevereCold />
               </Tooltip>
             )}
-            {actions && (table.getIsSomeRowsSelected() || table.getIsAllRowsSelected()) && (
+            {actions && getBulkActions(actions).length > 0 && (table.getIsSomeRowsSelected() || table.getIsAllRowsSelected()) && (
               <>
                 <Button
                   onClick={popover.handleOpen}
@@ -521,36 +525,34 @@ export const CIPPTableToptoolbar = ({
                     vertical: "top",
                   }}
                 >
-                  {actions
-                    ?.filter((action) => !action.link && !action?.hideBulk)
-                    .map((action, index) => (
-                      <MenuItem
-                        key={index}
-                        onClick={() => {
-                          setActionData({
-                            data: table.getSelectedRowModel().rows.map((row) => row.original),
-                            action: action,
-                            ready: true,
-                          });
+                  {getBulkActions(actions).map((action, index) => (
+                    <MenuItem
+                      key={index}
+                      onClick={() => {
+                        setActionData({
+                          data: table.getSelectedRowModel().rows.map((row) => row.original),
+                          action: action,
+                          ready: true,
+                        });
 
-                          if (action?.noConfirm && action.customFunction) {
-                            table
-                              .getSelectedRowModel()
-                              .rows.map((row) =>
-                                action.customFunction(row.original.original, action, {})
-                              );
-                          } else {
-                            createDialog.handleOpen();
-                            popover.handleClose();
-                          }
-                        }}
-                      >
-                        <SvgIcon fontSize="small" sx={{ minWidth: "30px" }}>
-                          {action.icon}
-                        </SvgIcon>
-                        <ListItemText>{action.label}</ListItemText>
-                      </MenuItem>
-                    ))}
+                        if (action?.noConfirm && action.customFunction) {
+                          table
+                            .getSelectedRowModel()
+                            .rows.map((row) =>
+                              action.customFunction(row.original.original, action, {})
+                            );
+                        } else {
+                          createDialog.handleOpen();
+                          popover.handleClose();
+                        }
+                      }}
+                    >
+                      <SvgIcon fontSize="small" sx={{ minWidth: "30px" }}>
+                        {action.icon}
+                      </SvgIcon>
+                      <ListItemText>{action.label}</ListItemText>
+                    </MenuItem>
+                  ))}
                 </Menu>
               </>
             )}