diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
index 1c0a4b75a4..4c8c753448 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
@@ -474,7 +474,7 @@ CREATE INDEX IDX_DM_APPLICATION ON DM_APPLICATION(DEVICE_ID, ENROLMENT_ID, TENAN
 
 -- POLICY RELATED TABLES  FINISHED --
 
-IF NOT EXISTS (SELECT * SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_APP_ICONS]') AND TYPE IN (N'U'))
+IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_APP_ICONS]') AND TYPE IN (N'U'))
 CREATE TABLE DM_APP_ICONS (
     ID INTEGER IDENTITY(1,1) NOT NULL,
     ICON_PATH VARCHAR(150) DEFAULT NULL,
@@ -884,7 +884,8 @@ CREATE TABLE DM_DEVICE_SUB_TYPE (
 -- END OF  DM_DEVICE_SUB_TYPE  TABLE--
 
 -- DM_TRACCAR_UNSYNCED_DEVICES TABLE --
-CREATE TABLE IF NOT EXISTS DM_TRACCAR_UNSYNCED_DEVICES (
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_TRACCAR_UNSYNCED_DEVICES]') AND TYPE IN (N'U'))
+CREATE TABLE DM_TRACCAR_UNSYNCED_DEVICES (
     ID INT NOT NULL IDENTITY(1,1),
     DEVICE_NAME VARCHAR(100) NOT NULL,
     IOTS_DEVICE_IDENTIFIER VARCHAR(300) NULL UNIQUE,