diff --git a/backend/api.js b/backend/api.js
index 433bc8d..da18dee 100644
--- a/backend/api.js
+++ b/backend/api.js
@@ -155,6 +155,11 @@ export class Session {
         logError(err);
         await this.teardown();
       });
+      // User may have closed websocket before we were able to set up
+      // the onclose listener.
+      if (this.ws.readyState === WebSocket.CLOSED) {
+        await this.teardown();
+      }
     } catch (err) {
       logError(err);
       this.sendError(err);