diff --git a/src/App/Container.purs b/src/App/Container.purs
index 90cab19..4d54e0e 100644
--- a/src/App/Container.purs
+++ b/src/App/Container.purs
@@ -463,11 +463,10 @@ handleAction = case _ of
 
   Disconnection -> do
     H.put $ initialState unit
+
+    -- Remove all stored session data.
     sessionstorage <- H.liftEffect $ Window.sessionStorage =<< HTML.window
-    _ <- H.liftEffect $ Storage.removeItem "user-authd-token" sessionstorage
-    _ <- H.liftEffect $ Storage.removeItem "current-page"     sessionstorage
-    _ <- H.liftEffect $ Storage.removeItem "current-zone"     sessionstorage
-    handleAction $ Routing Home
+    H.liftEffect $ Storage.clear sessionstorage
 
   -- TODO: depending on the current page, we should provide the received message to different components.
   DNSManagerDaemonEvent ev -> case ev of