diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql
index f04cb691b7d..4299ac52b6c 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql
@@ -4,10 +4,9 @@ CREATE TABLE IF NOT EXISTS  DM_DEVICE_TYPE (
 );
 
 CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
-  ID                    BIGSERIAL PRIMARY KEY,
+  ID                    BIGSERIAL NOT NULL PRIMARY KEY,
   SERIAL_NUMBER         VARCHAR(500) DEFAULT NULL,
-  CERTIFICATE           BYTEA DEFAULT NULL,
-  PRIMARY KEY (ID)
+  CERTIFICATE           BYTEA DEFAULT NULL
 );
 
 CREATE TABLE IF NOT EXISTS  DM_DEVICE (