diff --git a/app/src/main/java/eu/steffo/twom/matrix/MatrixActivity.kt b/app/src/main/java/eu/steffo/twom/matrix/MatrixActivity.kt
index 5aeee9c..4dcc9bf 100644
--- a/app/src/main/java/eu/steffo/twom/matrix/MatrixActivity.kt
+++ b/app/src/main/java/eu/steffo/twom/matrix/MatrixActivity.kt
@@ -42,16 +42,18 @@ class MatrixActivity : ComponentActivity() {
                     }
                 }
             }
-    }
 
-    override fun onStart() {
-        super.onStart()
+        // Check if there's a session already stored
+        session = TwoMMatrix.matrix.authenticationService().getLastAuthenticatedSession()
 
         setContent {
             MatrixActivityScaffold(
-                onClickLogin = this::onClickLogin
+                onClickLogin = this::onClickLogin,
+                session = session,
             )
         }
+
+        // No onStart is needed, as session already sets content when it's changed
     }
 
     private fun onClickLogin() {