diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigration.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigration.kt
index 54299acc74..d9ed15318a 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigration.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigration.kt
@@ -52,7 +52,7 @@ class MediaPreviewConfigMigration @Inject constructor(
                 }
             }
             .onFailure {
-                Timber.d("Couldn't perform migration, failed to fetch media preview config.")
+                Timber.e(it, "Couldn't perform migration, failed to fetch media preview config.")
             }
     }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
index c92f50bd2e..f5c1386658 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
@@ -7,7 +7,6 @@
 
 package io.element.android.features.preferences.impl.advanced
 
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -143,12 +142,10 @@ private fun ModerationAndSafety(
             title = stringResource(R.string.screen_advanced_settings_show_media_timeline_title),
             hasDivider = false,
             description = {
-                Row {
-                    ListSupportingText(
-                        text = stringResource(R.string.screen_advanced_settings_show_media_timeline_subtitle),
-                        contentPadding = ListSupportingTextDefaults.Padding.None,
-                    )
-                }
+                ListSupportingText(
+                    text = stringResource(R.string.screen_advanced_settings_show_media_timeline_subtitle),
+                    contentPadding = ListSupportingTextDefaults.Padding.None,
+                )
             }
         )
         ListItem(
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/MediaPreviewConfigStateStore.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/MediaPreviewConfigStateStore.kt
index 715938b93b..49f199ec3f 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/MediaPreviewConfigStateStore.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/MediaPreviewConfigStateStore.kt
@@ -88,8 +88,9 @@ class DefaultMediaPreviewConfigStateStore @Inject constructor(
 
     override fun setHideInviteAvatars(hide: Boolean) {
         sessionCoroutineScope.launch {
-            Timber.d("Setting hide invite avatars to $hide")
             val prevHideInviteAvatars = hideInviteAvatars.value
+            if (prevHideInviteAvatars == hide) return@launch
+            Timber.d("Setting hide invite avatars to $hide")
             hideInviteAvatars.value = hide
             runUpdatingState(setHideInviteAvatarsAction) {
                 mediaPreviewService
@@ -104,8 +105,9 @@ class DefaultMediaPreviewConfigStateStore @Inject constructor(
 
     override fun setTimelineMediaPreviewValue(value: MediaPreviewValue) {
         sessionCoroutineScope.launch {
-            Timber.d("Setting timeline media preview value to $value")
             val prevTimelineMediaPreviewValue = timelineMediaPreviewValue.value
+            if (prevTimelineMediaPreviewValue == value) return@launch
+            Timber.d("Setting timeline media preview value to $value")
             timelineMediaPreviewValue.value = value
             runUpdatingState(setTimelineMediaPreviewAction) {
                 mediaPreviewService
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaPreviewService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaPreviewService.kt
index c18f85712f..e4e9bc07bd 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaPreviewService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaPreviewService.kt
@@ -56,7 +56,7 @@ class RustMediaPreviewService(
 
 private fun RustMediaPreviewConfig.into(): MediaPreviewConfig {
     return MediaPreviewConfig(
-        mediaPreviewValue = this@into.mediaPreviews.into(),
+        mediaPreviewValue = mediaPreviews.into(),
         hideInviteAvatar = inviteAvatars == InviteAvatars.OFF
     )
 }