diff --git a/desktop/app/src/server.tsx b/desktop/app/src/server.tsx
index 52ec3a974..a539c0274 100644
--- a/desktop/app/src/server.tsx
+++ b/desktop/app/src/server.tsx
@@ -213,8 +213,9 @@ class Server extends EventEmitter {
                 const message = JSON.stringify(parsed.payload);
                 if (resolvedClient) {
                   resolvedClient.onMessage(message);
+                } else {
+                  client.then((c) => c.onMessage(message));
                 }
-                client.then((c) => c.onMessage(message));
               }
             });
             break;