diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsItem.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsItem.kt
index 6ff8b0985b..182944c70e 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsItem.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsItem.kt
@@ -17,7 +17,10 @@
 package io.element.android.features.roomdetails.impl.notificationsettings
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import io.element.android.features.roomdetails.impl.R
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
@@ -33,15 +36,15 @@ fun roomNotificationSettingsItems(): ImmutableList<RoomNotificationSettingsItem>
             when (it) {
                 RoomNotificationMode.ALL_MESSAGES -> RoomNotificationSettingsItem(
                     mode = it,
-                    title = "All messages",
+                    title = stringResource(R.string.screen_room_notification_settings_mode_all_messages),
                 )
                 RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> RoomNotificationSettingsItem(
                     mode = it,
-                    title = "Mentions and keywords",
+                    title = stringResource(R.string.screen_room_notification_settings_mode_mentions_and_keywords),
                 )
                 RoomNotificationMode.MUTE -> RoomNotificationSettingsItem(
                     mode = it,
-                    title = "Mute",
+                    title = stringResource(CommonStrings.common_mute),
                 )
             }
         }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
index da64259468..39fc07d055 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
@@ -103,9 +103,10 @@ class RustMatrixClient constructor(
     private val notificationClient = client.notificationClient().use { builder ->
         builder.filterByPushRules().finish()
     }
+    private val notificationSettings = client.getNotificationSettings()
 
     private val notificationService = RustNotificationService(sessionId, notificationClient, dispatchers, clock)
-    private val notificationSettingsService = RustNotificationSettingsService(client)
+    private val notificationSettingsService = RustNotificationSettingsService(notificationSettings)
 
     private val isLoggingOut = AtomicBoolean(false)
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt
index dc2fb33372..009cbd25d9 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt
@@ -25,16 +25,14 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import org.matrix.rustcomponents.sdk.Client
+import org.matrix.rustcomponents.sdk.NotificationClient
 import org.matrix.rustcomponents.sdk.NotificationSettings
 import org.matrix.rustcomponents.sdk.NotificationSettingsDelegate
-import timber.log.Timber
 
 class RustNotificationSettingsService(
-    private val client: Client,
+    private val notificationSettings: NotificationSettings
 ) : NotificationSettingsService {
 
-    private val notificationSettings: NotificationSettings = client.getNotificationSettings()
-
     private val _notificationSettingsChangeFlow = MutableSharedFlow<Unit>(extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
     override val notificationSettingsChangeFlow: SharedFlow<Unit> = _notificationSettingsChangeFlow.asSharedFlow()