diff --git a/src/components/GroupSystems/GroupImmutableSystems.js b/src/components/GroupSystems/GroupImmutableSystems.js
index 2bd89d1e7..d0f9298ea 100644
--- a/src/components/GroupSystems/GroupImmutableSystems.js
+++ b/src/components/GroupSystems/GroupImmutableSystems.js
@@ -131,10 +131,9 @@ const GroupImmutableSystems = ({ groupName, groupId, ...props }) => {
       enhancedConfig,
       showTags
     );
-
     const mapDeviceIds = mapDefaultData(defaultData.results);
     const updateInfo = await getUpdateInfo(groupId);
-    setDeviceData(updateInfo?.update_devices_uuids);
+    setDeviceData(updateInfo?.update_devices_uuids || []);
     setDeviceImageSet(updateInfo?.device_image_set_info);
     const rowInfo = [];
     let items = [];
@@ -206,6 +205,7 @@ const GroupImmutableSystems = ({ groupName, groupId, ...props }) => {
       setCanUpdate(false);
     }
   }, [deviceData, selected, deviceImageSet]);
+
   return (
     <div id="group-systems-table">
       {addToGroupModalOpen && (
@@ -274,9 +274,7 @@ const GroupImmutableSystems = ({ groupName, groupId, ...props }) => {
               {
                 title: (
                   <ActionDropdownItem
-                    isAriaDisabled={
-                      deviceData && !deviceData.find((obj) => obj === row.id)
-                    }
+                    isAriaDisabled={!deviceData.includes(row.id)}
                     requiredPermissions={REQUIRED_PERMISSIONS_TO_MODIFY_GROUP(
                       groupId
                     )}