diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt
index 8b216f3854..4c9e7e0595 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt
@@ -21,6 +21,7 @@ open class RoomListContentStateProvider : PreviewParameterProvider<RoomListConte
             aRoomsContentState(summaries = persistentListOf()),
             aSkeletonContentState(),
             anEmptyContentState(),
+            anEmptyContentState(securityBannerState = SecurityBannerState.SetUpRecovery),
             aRoomsContentState(securityBannerState = SecurityBannerState.NeedsNativeSlidingSyncMigration),
         )
 }
@@ -37,4 +38,8 @@ internal fun aRoomsContentState(
 
 internal fun aSkeletonContentState() = RoomListContentState.Skeleton(16)
 
-internal fun anEmptyContentState() = RoomListContentState.Empty
+internal fun anEmptyContentState(
+    securityBannerState: SecurityBannerState = SecurityBannerState.None,
+) = RoomListContentState.Empty(
+    securityBannerState = securityBannerState,
+)
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
index 248d788f6c..a9f64c4d06 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
@@ -236,11 +236,11 @@ class RoomListPresenter @Inject constructor(
                 client.isNativeSlidingSyncSupported() && !client.isUsingNativeSlidingSync()
             }.getOrNull().orFalse()
         }
+        val securityBannerState by rememberSecurityBannerState(securityBannerDismissed, needsSlidingSyncMigration)
         return when {
-            showEmpty -> RoomListContentState.Empty
+            showEmpty -> RoomListContentState.Empty(securityBannerState = securityBannerState)
             showSkeleton -> RoomListContentState.Skeleton(count = 16)
             else -> {
-                val securityBannerState by rememberSecurityBannerState(securityBannerDismissed, needsSlidingSyncMigration)
                 RoomListContentState.Rooms(
                     securityBannerState = securityBannerState,
                     fullScreenIntentPermissionsState = fullScreenIntentPermissionsPresenter.present(),
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt
index 642c7d879b..a6b9673b54 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt
@@ -61,7 +61,9 @@ enum class SecurityBannerState {
 @Immutable
 sealed interface RoomListContentState {
     data class Skeleton(val count: Int) : RoomListContentState
-    data object Empty : RoomListContentState
+    data class Empty(
+        val securityBannerState: SecurityBannerState,
+    ) : RoomListContentState
     data class Rooms(
         val securityBannerState: SecurityBannerState,
         val fullScreenIntentPermissionsState: FullScreenIntentPermissionsState,
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt
index d4af5a3fe5..503b00f348 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt
@@ -76,6 +76,10 @@ fun RoomListContentView(
             }
             is RoomListContentState.Empty -> {
                 EmptyView(
+                    state = contentState,
+                    eventSink = eventSink,
+                    onSetUpRecoveryClick = onSetUpRecoveryClick,
+                    onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
                     onCreateRoomClick = onCreateRoomClick,
                 )
             }
@@ -110,21 +114,44 @@ private fun SkeletonView(count: Int, modifier: Modifier = Modifier) {
 
 @Composable
 private fun EmptyView(
+    state: RoomListContentState.Empty,
+    eventSink: (RoomListEvents) -> Unit,
+    onSetUpRecoveryClick: () -> Unit,
+    onConfirmRecoveryKeyClick: () -> Unit,
     onCreateRoomClick: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
-    EmptyScaffold(
-        title = R.string.screen_roomlist_empty_title,
-        subtitle = R.string.screen_roomlist_empty_message,
-        action = {
-            Button(
-                text = stringResource(CommonStrings.action_start_chat),
-                leadingIcon = IconSource.Vector(CompoundIcons.Compose()),
-                onClick = onCreateRoomClick,
-            )
-        },
-        modifier = modifier.fillMaxSize(),
-    )
+    Box(modifier.fillMaxSize()) {
+        EmptyScaffold(
+            title = R.string.screen_roomlist_empty_title,
+            subtitle = R.string.screen_roomlist_empty_message,
+            action = {
+                Button(
+                    text = stringResource(CommonStrings.action_start_chat),
+                    leadingIcon = IconSource.Vector(CompoundIcons.Compose()),
+                    onClick = onCreateRoomClick,
+                )
+            },
+            modifier = Modifier.align(Alignment.Center),
+        )
+        Box {
+            when (state.securityBannerState) {
+                SecurityBannerState.SetUpRecovery -> {
+                    SetUpRecoveryKeyBanner(
+                        onContinueClick = onSetUpRecoveryClick,
+                        onDismissClick = { eventSink(RoomListEvents.DismissBanner) }
+                    )
+                }
+                SecurityBannerState.RecoveryKeyConfirmation -> {
+                    ConfirmRecoveryKeyBanner(
+                        onContinueClick = onConfirmRecoveryKeyClick,
+                        onDismissClick = { eventSink(RoomListEvents.DismissBanner) }
+                    )
+                }
+                else -> Unit
+            }
+        }
+    }
 }
 
 @Composable