diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/msg/TbMsgType.java b/common/data/src/main/java/org/thingsboard/server/common/data/msg/TbMsgType.java
index f7c9a5b05f..1f7691c7f5 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/msg/TbMsgType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/msg/TbMsgType.java
@@ -78,7 +78,7 @@ public enum TbMsgType {
     MSG_COUNT_SELF_MSG(null, true),
 
     // Custom or N/A type:
-    CUSTOM_OR_NA_TYPE(null, false);
+    NA(null, false);
 
     public static final List<String> NODE_CONNECTIONS = EnumSet.allOf(TbMsgType.class).stream()
             .filter(tbMsgType -> !tbMsgType.isTellSelfOnly())
diff --git a/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java b/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java
index c77d109814..870d5a2804 100644
--- a/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java
+++ b/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java
@@ -22,7 +22,7 @@ import java.util.List;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.thingsboard.server.common.data.msg.TbMsgType.ALARM;
 import static org.thingsboard.server.common.data.msg.TbMsgType.ALARM_DELETE;
-import static org.thingsboard.server.common.data.msg.TbMsgType.CUSTOM_OR_NA_TYPE;
+import static org.thingsboard.server.common.data.msg.TbMsgType.NA;
 import static org.thingsboard.server.common.data.msg.TbMsgType.DEDUPLICATION_TIMEOUT_SELF_MSG;
 import static org.thingsboard.server.common.data.msg.TbMsgType.DELAY_TIMEOUT_SELF_MSG;
 import static org.thingsboard.server.common.data.msg.TbMsgType.ENTITY_ASSIGNED_TO_EDGE;
@@ -53,7 +53,7 @@ class TbMsgTypeTest {
             DEDUPLICATION_TIMEOUT_SELF_MSG,
             DELAY_TIMEOUT_SELF_MSG,
             MSG_COUNT_SELF_MSG,
-            CUSTOM_OR_NA_TYPE
+            NA
     );
 
     // backward-compatibility tests
diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
index afd3d0268c..8b76677c76 100644
--- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
+++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
@@ -479,7 +479,7 @@ public final class TbMsg implements Serializable {
         try {
             return TbMsgType.valueOf(type);
         } catch (IllegalArgumentException e) {
-            return TbMsgType.CUSTOM_OR_NA_TYPE;
+            return TbMsgType.NA;
         }
     }