diff --git a/nodes/core/logic/17-split.js b/nodes/core/logic/17-split.js
index 083feaeec..47c97f8d0 100644
--- a/nodes/core/logic/17-split.js
+++ b/nodes/core/logic/17-split.js
@@ -416,7 +416,7 @@ module.exports = function(RED) {
                 }
                 // TODO: currently reuse the last received - add option to pick first received
                 group.msg = msg;
-                if (group.currentCount >= group.targetCount || msg.hasOwnProperty('complete')) {
+                if (group.currentCount >= (group.targetCount || msg.parts.count) || msg.hasOwnProperty('complete')) {
                     completeSend(partId);
                 }
             } catch(err) {