diff --git a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
index 7558ad946..a0898a506 100644
--- a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
@@ -489,6 +489,9 @@ class Flow {
                                 return resolve();
                             }
                         } else if (this.shutdownScope.length) {
+                            if (this.pendingMsgCount === 0) {
+                                return resolve();
+                            }
                             let count = 0;
                             this.shutdownScope.forEach((flow) => {
                                 if (flow instanceof Flow) {