diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js b/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js
index cfbd8e8f6..10b4349b8 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js
@@ -209,6 +209,7 @@ LocalFileSystem.prototype.open = function(){
             }
         });
     } else {
+        self._flushPendingWrites = function() { }
         return fs.ensureDir(self.storageBaseDir);
     }
 }
@@ -219,6 +220,12 @@ LocalFileSystem.prototype.close = function(){
         clearTimeout(this._pendingWriteTimeout);
         delete this._pendingWriteTimeout;
         this.flushInterval = 0;
+        self.writePromise = self.writePromise.then(function(){
+            return self._flushPendingWrites.call(self).catch(function(err) {
+                log.error(log._("context.localfilesystem.error-write",{message:err.toString()}));
+            });
+        });
+
     }
     return this.writePromise;
 }