diff --git a/src/Components/Web.JS/src/Boot.Server.Common.ts b/src/Components/Web.JS/src/Boot.Server.Common.ts
index 447ab449444e..7b1846b267fc 100644
--- a/src/Components/Web.JS/src/Boot.Server.Common.ts
+++ b/src/Components/Web.JS/src/Boot.Server.Common.ts
@@ -121,7 +121,7 @@ async function startServerCore(components: RootComponentManager<ServerComponentD
 
   Blazor.disconnect = cleanup;
 
-  window.addEventListener('unload', cleanup, { capture: false, once: true });
+  window.addEventListener('pagehide', cleanup, { capture: false, once: true });
 
   logger.log(LogLevel.Information, 'Blazor server-side application started.');