diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
index ad8ce0829bd..c854e809584 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
@@ -711,7 +711,8 @@ public class GeoLocationBasedServiceImpl implements GeoLocationBasedService {
             geofenceData.setLatitude(geofenceWrapper.getLatitude());
             geofenceData.setLongitude(geofenceWrapper.getLongitude());
             geofenceData.setRadius(geofenceWrapper.getRadius());
-
+            geofenceData.setFenceShape(geofenceWrapper.getFenceShape());
+            geofenceData.setGeoJson(geofenceWrapper.getGeoJson());
             GeoLocationProviderService geoService = DeviceMgtAPIUtils.getGeoService();
             if (!geoService.updateGeofence(geofenceData, fenceId)) {
                 String msg = "No valid Geofence found for ID " + fenceId;