diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/PolicyDAOImpl.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/PolicyDAOImpl.java
index f78feca333..cd886a4368 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/PolicyDAOImpl.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/PolicyDAOImpl.java
@@ -1282,11 +1282,11 @@ public class PolicyDAOImpl implements PolicyDAO {
             stmt.setInt(1, policyId);
             stmt.executeUpdate();
 
-            String deleteComplianceStatus ="DELETE FROM DM_POLICY_COMPLIANCE_STATUS WHERE POLICY_ID =?";
+          /*  String deleteComplianceStatus ="DELETE FROM DM_POLICY_COMPLIANCE_STATUS WHERE POLICY_ID =?";
             stmt = conn.prepareStatement(deleteComplianceStatus);
             stmt.setInt(1, policyId);
             stmt.executeUpdate();
-
+           */
             if (log.isDebugEnabled()) {
                 log.debug("Policy (" + policyId + ") related configs deleted from database.");
             }
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql
index 2ef6a29220..3c8b0cd88e 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql
@@ -309,9 +309,9 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_STATUS (
   LAST_FAILED_TIME TIMESTAMP NULL,
   ATTEMPTS INT NULL,
   PRIMARY KEY (ID),
-  CONSTRAINT FK_POLICY_COMPLIANCE_STATUS_POLICY
+  /*CONSTRAINT FK_POLICY_COMPLIANCE_STATUS_POLICY
     FOREIGN KEY (POLICY_ID)
-    REFERENCES DM_POLICY (ID)
+    REFERENCES DM_POLICY (ID)*/
     ON DELETE NO ACTION
     ON UPDATE NO ACTION
 );
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql
index e340450d4c..32c2e9f7e6 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql
@@ -297,9 +297,9 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_STATUS (
   LAST_FAILED_TIME TIMESTAMP NULL,
   ATTEMPTS INT NULL,
   PRIMARY KEY (ID),
-  CONSTRAINT FK_POLICY_COMPLIANCE_STATUS_POLICY
-    FOREIGN KEY (POLICY_ID)
-    REFERENCES DM_POLICY (ID)
+  /* CONSTRAINT FK_POLICY_COMPLIANCE_STATUS_POLICY
+   FOREIGN KEY (POLICY_ID)
+    REFERENCES DM_POLICY (ID)*/
     ON DELETE NO ACTION
     ON UPDATE NO ACTION
 )ENGINE = InnoDB;