components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/geofence/GenericGeofenceDAOImpl.java

@@ -626,6 +626,9 @@ public class GenericGeofenceDAOImpl extends AbstractGeofenceDAOImpl {
                         geofenceData.setGroupData(groupMap);
                     }
                 }
+                if (geofenceData != null) {
+                    geofenceData.setGroupIds(new ArrayList<>(groupMap.keySet()));
+                }
                 return geofenceData;
             }
         } catch (SQLException e) {

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/geofence/SQLServerGeofenceDAOImpl.java

@@ -157,6 +157,9 @@ public class SQLServerGeofenceDAOImpl extends AbstractGeofenceDAOImpl {
                         geofenceData.setFenceShape(rst.getString("FENCE_SHAPE"));
                         geofenceData.setGroupData(groupMap);
                     }
+                    if (geofenceData != null) {
+                        geofenceData.setGroupIds(new ArrayList<>(groupMap.keySet()));
+                    }
                     return geofenceData;
                 }
             }