diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractInsertRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractInsertRepository.java
index a4cd67abdc..e8134ca1a1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractInsertRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractInsertRepository.java
@@ -90,7 +90,7 @@ public abstract class AbstractInsertRepository {
     }
 
     protected String replaceNullChars(String strValue) {
-        if (removeNullChars) {
+        if (removeNullChars && strValue != null) {
             return PATTERN_THREAD_LOCAL.get().matcher(strValue).replaceAll(EMPTY_STR);
         }
         return strValue;