diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index c13c812a9..8733348bf 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -338,12 +338,14 @@ Node.prototype.close = function(removed) {
         }
     }
     if (promises.length > 0) {
-        return Promise.all(promises).then(function() {
+        return Promise.all(promises).then(() => {
+            this.removeAllListeners("input")
             if (this._context) {
                return context.delete(this._alias||this.id,this.z);
             }
         });
     } else {
+        this.removeAllListeners("input")
         if (this._context) {
             return context.delete(this._alias||this.id,this.z);
         }