diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
index 5e0c71ac4..f7f1471a5 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
@@ -2543,6 +2543,28 @@ $(document).ready(function () {
         }
     });
 
+    /**
+     *
+     * Fix for the bug EMM-1719
+     */
+    $(advanceOperations).on('hidden.bs.collapse', function () {
+        if($(this).find('input').prop('checked')){
+            $(this).find('input').prop('checked',false);
+        }
+    });
+
+    /**
+     *
+     * Fix for the bug EMM-1719
+     */
+    $(advanceOperations).on('shown.bs.collapse', function () {
+        if($(this).find('input').prop('checked') == false){
+            $(this).find('input').prop('checked',true);
+        }
+    });
+
+
+
     // adding support for cloning multiple profiles per feature with cloneable class definitions
     $(advanceOperations).on("click", ".multi-view.add.enabled", function () {
         // get a copy of .cloneable and create new .cloned div element