diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java
index 8d96dd293b..833a18ad39 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java
@@ -86,6 +86,18 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD
     public static final String ASC_ORDER = "ASC";
     public static final long SECONDS_IN_DAY = TimeUnit.DAYS.toSeconds(1);
     protected static final List<Long> FIXED_PARTITION = List.of(0L);
+    private static String INSERT_WITH_NULL = INSERT_INTO + ModelConstants.TS_KV_CF +
+            "(" + ModelConstants.ENTITY_TYPE_COLUMN +
+            "," + ModelConstants.ENTITY_ID_COLUMN +
+            "," + ModelConstants.KEY_COLUMN +
+            "," + ModelConstants.PARTITION_COLUMN +
+            "," + ModelConstants.TS_COLUMN +
+            "," + ModelConstants.BOOLEAN_VALUE_COLUMN +
+            "," + ModelConstants.STRING_VALUE_COLUMN +
+            "," + ModelConstants.LONG_VALUE_COLUMN +
+            "," + ModelConstants.DOUBLE_VALUE_COLUMN +
+            "," + ModelConstants.JSON_VALUE_COLUMN + ")" +
+            " VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
     private CassandraTsPartitionsCache cassandraTsPartitionsCache;
 
@@ -566,18 +578,7 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD
             stmtCreationLock.lock();
             try {
                 if (saveWithNullStmt == null) {
-                    saveWithNullStmt = prepare(INSERT_INTO + ModelConstants.TS_KV_CF +
-                            "(" + ModelConstants.ENTITY_TYPE_COLUMN +
-                            "," + ModelConstants.ENTITY_ID_COLUMN +
-                            "," + ModelConstants.KEY_COLUMN +
-                            "," + ModelConstants.PARTITION_COLUMN +
-                            "," + ModelConstants.TS_COLUMN +
-                            "," + ModelConstants.BOOLEAN_VALUE_COLUMN +
-                            "," + ModelConstants.STRING_VALUE_COLUMN +
-                            "," + ModelConstants.LONG_VALUE_COLUMN +
-                            "," + ModelConstants.DOUBLE_VALUE_COLUMN +
-                            "," + ModelConstants.JSON_VALUE_COLUMN + ")" +
-                            " VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+                    saveWithNullStmt = prepare(INSERT_WITH_NULL);
                 }
             } finally {
                 stmtCreationLock.unlock();
@@ -591,18 +592,7 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD
             stmtCreationLock.lock();
             try {
                 if (saveWithNullWithTtlStmt == null) {
-                    saveWithNullWithTtlStmt = prepare(INSERT_INTO + ModelConstants.TS_KV_CF +
-                            "(" + ModelConstants.ENTITY_TYPE_COLUMN +
-                            "," + ModelConstants.ENTITY_ID_COLUMN +
-                            "," + ModelConstants.KEY_COLUMN +
-                            "," + ModelConstants.PARTITION_COLUMN +
-                            "," + ModelConstants.TS_COLUMN +
-                            "," + ModelConstants.BOOLEAN_VALUE_COLUMN +
-                            "," + ModelConstants.STRING_VALUE_COLUMN +
-                            "," + ModelConstants.LONG_VALUE_COLUMN +
-                            "," + ModelConstants.DOUBLE_VALUE_COLUMN +
-                            "," + ModelConstants.JSON_VALUE_COLUMN + ")" +
-                            " VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?) USING TTL ?");
+                    saveWithNullWithTtlStmt = prepare(INSERT_WITH_NULL + " USING TTL ?");
                 }
             } finally {
                 stmtCreationLock.unlock();