diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/otp/mgt/service/OTPManagementServiceImpl.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/otp/mgt/service/OTPManagementServiceImpl.java
index d8872be9212..bc9204eecbf 100644
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/otp/mgt/service/OTPManagementServiceImpl.java
+++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/otp/mgt/service/OTPManagementServiceImpl.java
@@ -276,9 +276,7 @@ public class OTPManagementServiceImpl implements OTPManagementService {
     public OneTimePinDTO generateOneTimePin(OneTimePinDTO oneTimePinDTO, boolean persistPin) throws OTPManagementException {
 
         String otpValue = UUID.randomUUID().toString();
-
-        Gson gson = new Gson();
-        String metaInfo = gson.toJson(oneTimePinDTO.getMetaInfo());
+        String metaInfo = oneTimePinDTO.getMetaInfo();
 
         oneTimePinDTO.setMetaInfo(metaInfo);
         oneTimePinDTO.setOtpToken(otpValue);
diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
index b3bc1c36ea3..a0be9fd7048 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
@@ -608,7 +608,7 @@ CREATE TABLE IF NOT EXISTS DM_OTP_DATA (
    USERNAME  VARCHAR(500) DEFAULT NOT NULL,
    EMAIL VARCHAR(100) NOT NULL,
    EMAIL_TYPE VARCHAR(20) NOT NULL,
-   META_INFO VARCHAR(20000) NOT NULL,
+   META_INFO VARCHAR(20000) NULL,
    CREATED_AT TIMESTAMP NOT NULL,
    EXPIRY_TIME INT NOT NULL DEFAULT 3600,
    IS_EXPIRED BOOLEAN DEFAULT false,
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 34ff7ef1a7f..16af46d997a 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
@@ -669,7 +669,7 @@ CREATE TABLE DM_OTP_DATA (
      USERNAME VARCHAR(500) NOT NULL,
      EMAIL VARCHAR(100) NOT NULL,
      EMAIL_TYPE VARCHAR(20) NOT NULL,
-     META_INFO VARCHAR(8000) NOT NULL,
+     META_INFO VARCHAR(8000) NULL,
      CREATED_AT DATETIME2(0) NOT NULL,
      EXPIRY_TIME INT NOT NULL DEFAULT 3600,
      IS_EXPIRED BIT DEFAULT 0,
diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
index e55274e49f2..d184237d445 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
@@ -665,7 +665,7 @@ CREATE TABLE IF NOT EXISTS DM_OTP_DATA (
    USERNAME VARCHAR(500) NOT NULL,
    EMAIL VARCHAR(100) NOT NULL,
    EMAIL_TYPE VARCHAR(20) NOT NULL,
-   META_INFO VARCHAR(20000) NOT NULL,
+   META_INFO VARCHAR(20000) NULL,
    CREATED_AT TIMESTAMP NOT NULL,
    EXPIRY_TIME INT NOT NULL DEFAULT 3600,
    IS_EXPIRED BOOLEAN DEFAULT false,
diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
index 708f135b781..60c7aaf89e6 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
@@ -1026,7 +1026,7 @@ CREATE TABLE DM_OTP_DATA (
      USERNAME VARCHAR(500) NOT NULL,
      EMAIL VARCHAR2(100) NOT NULL,
      EMAIL_TYPE VARCHAR2(20) NOT NULL,
-     META_INFO VARCHAR2(20000) NOT NULL,
+     META_INFO VARCHAR2(20000) NULL,
      CREATED_AT TIMESTAMP(0) NOT NULL,
      EXPIRY_TIME NUMBER(10) DEFAULT 3600 NOT NULL,
      IS_EXPIRED CHAR(1) DEFAULT false,
diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
index 3ff77c0242f..f9f68793382 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
@@ -672,7 +672,7 @@ CREATE TABLE IF NOT EXISTS DM_OTP_DATA (
    USERNAME VARCHAR(500) NOT NULL,
    EMAIL VARCHAR(100) NOT NULL,
    EMAIL_TYPE VARCHAR(20) NOT NULL,
-   META_INFO VARCHAR(20000) NOT NULL,
+   META_INFO VARCHAR(20000) NULL,
    CREATED_AT TIMESTAMP(0) NOT NULL,
    EXPIRY_TIME INT NOT NULL DEFAULT 3600,
    IS_EXPIRED BOOLEAN DEFAULT false,