diff --git a/core/src/main/java/org/futo/circles/core/provider/MatrixSessionProvider.kt b/core/src/main/java/org/futo/circles/core/provider/MatrixSessionProvider.kt
index 05976d0b0f7d58d6493e115cf7f1052768c5999d..775acc48e7a15594fd527f96c8c67070822cf32e 100644
--- a/core/src/main/java/org/futo/circles/core/provider/MatrixSessionProvider.kt
+++ b/core/src/main/java/org/futo/circles/core/provider/MatrixSessionProvider.kt
@@ -16,7 +16,8 @@ object MatrixSessionProvider {
     private var notificationSetupListener: MatrixNotificationSetupListener? = null
     private var onNewAuthLister: (() -> Unit)? = null
 
-    fun getSessionOrThrow() = currentSession ?: throw IllegalArgumentException("Session is not created")
+    fun getSessionOrThrow() =
+        currentSession ?: throw IllegalArgumentException("Session is not created")
 
     fun initSession(
         context: Context,
@@ -98,7 +99,9 @@ object MatrixSessionProvider {
 
     //For Room history share
     private fun enableInviteKeysSharing(session: Session) {
-        val isEnabled = session.cryptoService().isShareKeysOnInviteEnabled()
-        if (!isEnabled) session.cryptoService().enableShareKeyOnInvite(true)
+        tryOrNull {
+            val isEnabled = session.cryptoService().isShareKeysOnInviteEnabled()
+            if (!isEnabled) session.cryptoService().enableShareKeyOnInvite(true)
+        }
     }
 }
\ No newline at end of file