diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmCommentEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmCommentEntity.java
index 089ba0709a..c8651b86c8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmCommentEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmCommentEntity.java
@@ -89,7 +89,9 @@ public abstract class AbstractAlarmCommentEntity<T extends AlarmComment> extends
         AlarmComment alarmComment = new AlarmComment(new AlarmCommentId(id));
         alarmComment.setCreatedTime(createdTime);
         alarmComment.setAlarmId(new AlarmId(alarmId));
-        alarmComment.setUserId(new UserId(userId));
+        if (userId != null) {
+            alarmComment.setUserId(new UserId(userId));
+        }
         alarmComment.setType(type);
         alarmComment.setComment(comment);
         return alarmComment;