diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.corrective-action/public/templates/policy-corrective-action.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.corrective-action/public/templates/policy-corrective-action.hbs
index fa3da3680d..6bd184a0c1 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.corrective-action/public/templates/policy-corrective-action.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.corrective-action/public/templates/policy-corrective-action.hbs
@@ -20,5 +20,16 @@ Once this is supported for other device type the below condition can be removed.
         </div>
         <br class="c-both"/>
     </div>
+    <div id="corrective-action-policy-id-missing-msg" class="hidden">
+        <br/>
+        <br/>
+        <span class="alert alert-info">
+            <strong>
+                <i class="icon fw fw-info"></i>
+                Corrective policy has been automatically changed to NONE since a previously selected corrective policy
+                has been updated to a GENERAL policy or it has been deleted.
+            </strong>
+        </span>
+    </div>
 </div>
 {{/equal}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
index 061b02b0c4..9ae9afc208 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
@@ -305,7 +305,11 @@ stepForwardFrom["policy-profile"] = function () {
                             currentlyEffected.correctiveActions.length > 0) {
                            currentlyEffected.correctiveActions.forEach(function (correctiveAction) {
                               if ("POLICY" === correctiveAction.actionType) {
-                                  $("#corrective-policy-input").val(correctiveAction.policyId);
+                                  if ($("#corrective-policy-input option[value=" + correctiveAction.policyId + "]").length > 0) {
+                                      $("#corrective-policy-input").val(correctiveAction.policyId);
+                                  } else {
+                                      $("#corrective-action-policy-id-missing-msg").removeClass("hidden");
+                                  }
                                   // returned from for each since currently only supported corrective action type is
                                   // POLICY.
                                   return true;