diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementView.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementView.kt
index 58799c05bd..7f0a7291a5 100644
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementView.kt
+++ b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementView.kt
@@ -49,9 +49,7 @@ fun SpaceAnnouncementView(
         eventSink(SpaceAnnouncementEvents.Continue)
     }
 
-    BackHandler {
-        state.eventSink(SpaceAnnouncementEvents.Continue)
-    }
+    BackHandler(onBack = ::onContinue)
     HeaderFooterPage(
         modifier = modifier,
         isScrollable = true,