diff --git a/src/shared/services/WebSocketService.ts b/src/shared/services/WebSocketService.ts
index 1bf12fd5..4c91d405 100644
--- a/src/shared/services/WebSocketService.ts
+++ b/src/shared/services/WebSocketService.ts
@@ -43,8 +43,11 @@ export class WebSocketService {
     }).pipe(share());
 
     if (isBrowser()) {
-      window.onbeforeunload = () => {
+      window.onunload = () => {
         this.ws.close();
+
+        // Clears out scroll positions.
+        sessionStorage.clear();
       };
     }
   }