diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbAbstractTransformNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbAbstractTransformNode.java
index b2a1599e8c..093c76a161 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbAbstractTransformNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbAbstractTransformNode.java
@@ -60,25 +60,23 @@ public abstract class TbAbstractTransformNode<C> implements TbNode {
     }
 
     protected void transformSuccess(TbContext ctx, TbMsg msg, List<TbMsg> msgs) {
-        if (msgs != null && !msgs.isEmpty()) {
-            if (msgs.size() == 1) {
-                ctx.tellSuccess(msgs.get(0));
-            } else {
-                TbMsgCallbackWrapper wrapper = new MultipleTbMsgsCallbackWrapper(msgs.size(), new TbMsgCallback() {
-                    @Override
-                    public void onSuccess() {
-                        ctx.ack(msg);
-                    }
-
-                    @Override
-                    public void onFailure(RuleEngineException e) {
-                        ctx.tellFailure(msg, e);
-                    }
-                });
-                msgs.forEach(newMsg -> ctx.enqueueForTellNext(newMsg, TbRelationTypes.SUCCESS, wrapper::onSuccess, wrapper::onFailure));
-            }
-        } else {
+        if (msgs == null || msgs.isEmpty()) {
             ctx.tellFailure(msg, new RuntimeException("Message or messages list are empty!"));
+        } else if (msgs.size() == 1) {
+            ctx.tellSuccess(msgs.get(0));
+        } else {
+            TbMsgCallbackWrapper wrapper = new MultipleTbMsgsCallbackWrapper(msgs.size(), new TbMsgCallback() {
+                @Override
+                public void onSuccess() {
+                    ctx.ack(msg);
+                }
+
+                @Override
+                public void onFailure(RuleEngineException e) {
+                    ctx.tellFailure(msg, e);
+                }
+            });
+            msgs.forEach(newMsg -> ctx.enqueueForTellNext(newMsg, TbRelationTypes.SUCCESS, wrapper::onSuccess, wrapper::onFailure));
         }
     }