diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
index 79d158b8ea..4ef06be29c 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
@@ -44,7 +44,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_PROPERTIES (
      DEVICE_IDENTIFICATION VARCHAR(300) NOT NULL,
      PROPERTY_NAME VARCHAR(100) DEFAULT 0,
      PROPERTY_VALUE VARCHAR(100) DEFAULT NULL,
-     TENANT_ID VARCHAR(100),
+     TENANT_ID INTEGER DEFAULT 0,
      PRIMARY KEY (DEVICE_TYPE_NAME, DEVICE_IDENTIFICATION, PROPERTY_NAME, TENANT_ID)
 );