diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/Matrix.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/Matrix.kt
index 489df2e2ff..3252a9ebad 100644
--- a/libraries/matrix/src/main/java/io/element/android/x/matrix/Matrix.kt
+++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/Matrix.kt
@@ -7,6 +7,7 @@ import io.element.android.x.matrix.util.logError
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.AuthenticationService
 import org.matrix.rustcomponents.sdk.Client
@@ -26,13 +27,11 @@ class Matrix(
     private val baseFolder = File(context.filesDir, "matrix")
     private val sessionStore = SessionStore(context)
     private val matrixClient = MutableStateFlow<Optional<MatrixClient>>(Optional.empty())
-    private val isLoggedIn = MutableStateFlow(false)
 
     init {
         sessionStore.isLoggedIn()
             .distinctUntilChanged()
             .onEach { isLoggedIn ->
-                this.isLoggedIn.value = isLoggedIn
                 if (!isLoggedIn) {
                     matrixClient.value = Optional.empty()
                 }
@@ -41,7 +40,7 @@ class Matrix(
     }
 
     fun isLoggedIn(): Flow<Boolean> {
-        return isLoggedIn
+        return sessionStore.isLoggedIn()
     }
 
     fun client(): Flow<Optional<MatrixClient>> {
diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixInstance.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixInstance.kt
index c93b6ce1c7..c1f86dcb1d 100644
--- a/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixInstance.kt
+++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixInstance.kt
@@ -3,7 +3,6 @@ package io.element.android.x.matrix
 import android.annotation.SuppressLint
 import android.content.Context
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.GlobalScope
 
 
 object MatrixInstance {
@@ -11,6 +10,7 @@ object MatrixInstance {
     private lateinit var instance: Matrix
 
     fun init(context: Context, coroutineScope: CoroutineScope) {
+        //setupTracing("warn,matrix_sdk::sliding_sync=info")
         instance = Matrix(coroutineScope, context)
     }