diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/psql/PsqlInsertTsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/psql/PsqlInsertTsRepository.java
index caf4528812..00be466027 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/psql/PsqlInsertTsRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/psql/PsqlInsertTsRepository.java
@@ -85,10 +85,10 @@ public class PsqlInsertTsRepository extends AbstractInsertRepository implements
                 } else {
                     ps.setNull(7, Types.DOUBLE);
                     ps.setNull(12, Types.DOUBLE);
-
-                    ps.setString(8, replaceNullChars(tsKvEntity.getJsonValue()));
-                    ps.setString(13, replaceNullChars(tsKvEntity.getJsonValue()));
                 }
+
+                ps.setString(8, replaceNullChars(tsKvEntity.getJsonValue()));
+                ps.setString(13, replaceNullChars(tsKvEntity.getJsonValue()));
             }
 
             @Override