diff --git a/lib/modules/webserver/server.js b/lib/modules/webserver/server.js
index fcd0a83c6..239677a44 100644
--- a/lib/modules/webserver/server.js
+++ b/lib/modules/webserver/server.js
@@ -42,8 +42,13 @@ class Server {
     this.app.ws('/', function(ws, _req) {
       self.events.on('outputDone', () => {
         if (ws.readyState === WEB_SOCKET_STATE_OPEN) {
-          ws.send('outputDone');
+          return ws.send('outputDone');
         }
+        // if the socket wasn't yet opened, listen for the 'open' event,
+        // then send the 'outputDone' data
+        ws.addEventListener('open', _event => {
+          ws.send('outputDone');
+        });
       });
     });