diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ActiveNotificationsProvider.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ActiveNotificationsProvider.kt
index 4cc279b8bb..fd2788279b 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ActiveNotificationsProvider.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ActiveNotificationsProvider.kt
@@ -34,6 +34,7 @@ interface ActiveNotificationsProvider {
     fun getMembershipNotificationForSession(sessionId: SessionId): List<StatusBarNotification>
     fun getMembershipNotificationForRoom(sessionId: SessionId, roomId: RoomId): List<StatusBarNotification>
     fun getSummaryNotification(sessionId: SessionId): StatusBarNotification?
+    fun getFallbackNotification(sessionId: SessionId): StatusBarNotification?
     fun count(sessionId: SessionId): Int
 }
 
@@ -76,6 +77,11 @@ class DefaultActiveNotificationsProvider(
         return getNotificationsForSession(sessionId).find { it.id == summaryId }
     }
 
+    override fun getFallbackNotification(sessionId: SessionId): StatusBarNotification? {
+        val fallbackId = NotificationIdProvider.getFallbackNotificationId(sessionId)
+        return getNotificationsForSession(sessionId).find { it.id == fallbackId }
+    }
+
     override fun count(sessionId: SessionId): Int {
         return getNotificationsForSession(sessionId).size
     }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/FallbackNotificationFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/FallbackNotificationFactory.kt
index 7b06aae39f..970f19fd45 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/FallbackNotificationFactory.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/FallbackNotificationFactory.kt
@@ -12,15 +12,12 @@ import dev.zacsweers.metro.Inject
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.push.impl.R
 import io.element.android.libraries.push.impl.notifications.model.FallbackNotifiableEvent
-import io.element.android.services.toolbox.api.strings.StringProvider
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 
 @Inject
 class FallbackNotificationFactory(
     private val clock: SystemClock,
-    private val stringProvider: StringProvider,
 ) {
     fun create(
         sessionId: SessionId,
@@ -36,7 +33,7 @@ class FallbackNotificationFactory(
         isRedacted = false,
         isUpdated = false,
         timestamp = clock.epochMillis(),
-        description = stringProvider.getString(R.string.notification_fallback_content),
+        description = "",
         cause = cause,
     )
 }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactory.kt
index 6a84f8df8f..f44ea41c45 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactory.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactory.kt
@@ -21,7 +21,6 @@ import io.element.android.libraries.push.impl.notifications.model.FallbackNotifi
 import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.NotifiableMessageEvent
 import io.element.android.libraries.push.impl.notifications.model.SimpleNotifiableEvent
-import io.element.android.services.toolbox.api.strings.StringProvider
 
 interface NotificationDataFactory {
     suspend fun toNotifications(
@@ -46,16 +45,15 @@ interface NotificationDataFactory {
 
     @JvmName("toNotificationFallbackEvents")
     @Suppress("INAPPLICABLE_JVM_NAME")
-    fun toNotifications(
+    fun toNotification(
         fallback: List<FallbackNotifiableEvent>,
         notificationAccountParams: NotificationAccountParams,
-    ): List<OneShotNotification>
+    ): OneShotNotification?
 
     fun createSummaryNotification(
         roomNotifications: List<RoomNotification>,
         invitationNotifications: List<OneShotNotification>,
         simpleNotifications: List<OneShotNotification>,
-        fallbackNotifications: List<OneShotNotification>,
         notificationAccountParams: NotificationAccountParams,
     ): SummaryNotification
 }
@@ -66,7 +64,6 @@ class DefaultNotificationDataFactory(
     private val roomGroupMessageCreator: RoomGroupMessageCreator,
     private val summaryGroupMessageCreator: SummaryGroupMessageCreator,
     private val activeNotificationsProvider: ActiveNotificationsProvider,
-    private val stringProvider: StringProvider,
 ) : NotificationDataFactory {
     override suspend fun toNotifications(
         messages: List<NotifiableMessageEvent>,
@@ -141,25 +138,31 @@ class DefaultNotificationDataFactory(
 
     @JvmName("toNotificationFallbackEvents")
     @Suppress("INAPPLICABLE_JVM_NAME")
-    override fun toNotifications(
+    override fun toNotification(
         fallback: List<FallbackNotifiableEvent>,
         notificationAccountParams: NotificationAccountParams,
-    ): List<OneShotNotification> {
-        return fallback.map { event ->
-            OneShotNotification(
-                tag = event.eventId.value,
-                notification = notificationCreator.createFallbackNotification(notificationAccountParams, event),
-                isNoisy = false,
-                timestamp = event.timestamp
-            )
-        }
+    ): OneShotNotification? {
+        if (fallback.isEmpty()) return null
+        val existingNotification = activeNotificationsProvider
+            .getFallbackNotification(notificationAccountParams.user.userId)
+            ?.notification
+        val notification = notificationCreator.createFallbackNotification(
+            existingNotification,
+            notificationAccountParams,
+            fallback,
+        )
+        return OneShotNotification(
+            tag = "FALLBACK",
+            notification = notification,
+            isNoisy = false,
+            timestamp = fallback.first().timestamp
+        )
     }
 
     override fun createSummaryNotification(
         roomNotifications: List<RoomNotification>,
         invitationNotifications: List<OneShotNotification>,
         simpleNotifications: List<OneShotNotification>,
-        fallbackNotifications: List<OneShotNotification>,
         notificationAccountParams: NotificationAccountParams,
     ): SummaryNotification {
         return when {
@@ -169,7 +172,6 @@ class DefaultNotificationDataFactory(
                     roomNotifications = roomNotifications,
                     invitationNotifications = invitationNotifications,
                     simpleNotifications = simpleNotifications,
-                    fallbackNotifications = fallbackNotifications,
                     notificationAccountParams = notificationAccountParams,
                 )
             )
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRenderer.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRenderer.kt
index 26769f09ba..c26a495ce8 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRenderer.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRenderer.kt
@@ -55,12 +55,11 @@ class NotificationRenderer(
         val roomNotifications = notificationDataFactory.toNotifications(groupedEvents.roomEvents, imageLoader, notificationAccountParams)
         val invitationNotifications = notificationDataFactory.toNotifications(groupedEvents.invitationEvents, notificationAccountParams)
         val simpleNotifications = notificationDataFactory.toNotifications(groupedEvents.simpleEvents, notificationAccountParams)
-        val fallbackNotifications = notificationDataFactory.toNotifications(groupedEvents.fallbackEvents, notificationAccountParams)
+        val fallbackNotification = notificationDataFactory.toNotification(groupedEvents.fallbackEvents, notificationAccountParams)
         val summaryNotification = notificationDataFactory.createSummaryNotification(
             roomNotifications = roomNotifications,
             invitationNotifications = invitationNotifications,
             simpleNotifications = simpleNotifications,
-            fallbackNotifications = fallbackNotifications,
             notificationAccountParams = notificationAccountParams,
         )
 
@@ -107,13 +106,12 @@ class NotificationRenderer(
             }
         }
 
-        // Show only the first fallback notification
-        if (fallbackNotifications.isNotEmpty()) {
-            Timber.tag(loggerTag.value).d("Showing fallback notification")
+        if (fallbackNotification != null) {
+            Timber.tag(loggerTag.value).d("Showing or updating fallback notification")
             notificationDisplayer.showNotification(
-                tag = "FALLBACK",
+                tag = fallbackNotification.tag,
                 id = NotificationIdProvider.getFallbackNotificationId(currentUser.userId),
-                notification = fallbackNotifications.first().notification
+                notification = fallbackNotification.notification,
             )
         }
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/SummaryGroupMessageCreator.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/SummaryGroupMessageCreator.kt
index f7f0c057c6..d283adae71 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/SummaryGroupMessageCreator.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/SummaryGroupMessageCreator.kt
@@ -22,7 +22,6 @@ interface SummaryGroupMessageCreator {
         roomNotifications: List<RoomNotification>,
         invitationNotifications: List<OneShotNotification>,
         simpleNotifications: List<OneShotNotification>,
-        fallbackNotifications: List<OneShotNotification>,
     ): Notification
 }
 
@@ -45,7 +44,6 @@ class DefaultSummaryGroupMessageCreator(
         roomNotifications: List<RoomNotification>,
         invitationNotifications: List<OneShotNotification>,
         simpleNotifications: List<OneShotNotification>,
-        fallbackNotifications: List<OneShotNotification>,
     ): Notification {
         val summaryIsNoisy = roomNotifications.any { it.shouldBing } ||
             invitationNotifications.any { it.isNoisy } ||
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt
index 9533f6b0ac..9707a35398 100755
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt
@@ -75,8 +75,9 @@ interface NotificationCreator {
     ): Notification
 
     fun createFallbackNotification(
+        existingNotification: Notification?,
         notificationAccountParams: NotificationAccountParams,
-        fallbackNotifiableEvent: FallbackNotifiableEvent,
+        fallbackNotifiableEvents: List<FallbackNotifiableEvent>,
     ): Notification
 
     /**
@@ -240,11 +241,13 @@ class DefaultNotificationCreator(
             .addAction(rejectInvitationActionFactory.create(inviteNotifiableEvent))
             .addAction(acceptInvitationActionFactory.create(inviteNotifiableEvent))
             // Build the pending intent for when the notification is clicked
-            .setContentIntent(pendingIntentFactory.createOpenRoomPendingIntent(
-                sessionId = inviteNotifiableEvent.sessionId,
-                roomId = inviteNotifiableEvent.roomId,
-                eventId = null,
-            ))
+            .setContentIntent(
+                pendingIntentFactory.createOpenRoomPendingIntent(
+                    sessionId = inviteNotifiableEvent.sessionId,
+                    roomId = inviteNotifiableEvent.roomId,
+                    eventId = null,
+                )
+            )
             .apply {
                 if (inviteNotifiableEvent.noisy) {
                     // Compat
@@ -276,12 +279,14 @@ class DefaultNotificationCreator(
             .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_ALL)
             .configureWith(notificationAccountParams)
             .setAutoCancel(true)
-            .setContentIntent(pendingIntentFactory.createOpenRoomPendingIntent(
-                sessionId = simpleNotifiableEvent.sessionId,
-                roomId = simpleNotifiableEvent.roomId,
-                eventId = null,
-                extras = bundleOf(ROOM_OPENED_FROM_NOTIFICATION to true),
-            ))
+            .setContentIntent(
+                pendingIntentFactory.createOpenRoomPendingIntent(
+                    sessionId = simpleNotifiableEvent.sessionId,
+                    roomId = simpleNotifiableEvent.roomId,
+                    eventId = null,
+                    extras = bundleOf(ROOM_OPENED_FROM_NOTIFICATION to true),
+                )
+            )
             .apply {
                 if (simpleNotifiableEvent.noisy) {
                     // Compat
@@ -295,28 +300,35 @@ class DefaultNotificationCreator(
     }
 
     override fun createFallbackNotification(
+        existingNotification: Notification?,
         notificationAccountParams: NotificationAccountParams,
-        fallbackNotifiableEvent: FallbackNotifiableEvent,
+        fallbackNotifiableEvents: List<FallbackNotifiableEvent>,
     ): Notification {
         val channelId = notificationChannels.getChannelIdForMessage(false)
+        val existingCounter = existingNotification
+            ?.extras
+            ?.getInt(FALLBACK_COUNTER_EXTRA)
+            ?: 0
+        val counter = existingCounter + fallbackNotifiableEvents.size
+        val fallbackNotifiableEvent = fallbackNotifiableEvents.first()
         return NotificationCompat.Builder(context, channelId)
             .setOnlyAlertOnce(true)
             .setContentTitle(buildMeta.applicationName.annotateForDebug(7))
-            .setContentText(fallbackNotifiableEvent.description.orEmpty().annotateForDebug(8))
+            .setContentText(
+                stringProvider.getQuantityString(R.plurals.notification_fallback_n_content, counter, counter)
+                    .annotateForDebug(8)
+            )
+            .setExtras(
+                bundleOf(
+                    FALLBACK_COUNTER_EXTRA to counter
+                )
+            )
+            .setNumber(counter)
             .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_ALL)
             .configureWith(notificationAccountParams)
             .setAutoCancel(true)
             .setWhen(fallbackNotifiableEvent.timestamp)
-            // Ideally we'd use `createOpenRoomPendingIntent` here, but the broken notification might apply to an invite
-            // and the user won't have access to the room yet, resulting in an error screen.
             .setContentIntent(pendingIntentFactory.createOpenSessionPendingIntent(fallbackNotifiableEvent.sessionId))
-            .setDeleteIntent(
-                pendingIntentFactory.createDismissEventPendingIntent(
-                    fallbackNotifiableEvent.sessionId,
-                    fallbackNotifiableEvent.roomId,
-                    fallbackNotifiableEvent.eventId
-                )
-            )
             .setPriority(NotificationCompat.PRIORITY_LOW)
             .build()
     }
@@ -503,6 +515,7 @@ class DefaultNotificationCreator(
 
     companion object {
         const val MESSAGE_EVENT_ID = "message_event_id"
+        private const val FALLBACK_COUNTER_EXTRA = "COUNTER"
     }
 }
 
diff --git a/libraries/push/impl/src/main/res/values/localazy.xml b/libraries/push/impl/src/main/res/values/localazy.xml
index aac5c6c72b..15afb93d3f 100644
--- a/libraries/push/impl/src/main/res/values/localazy.xml
+++ b/libraries/push/impl/src/main/res/values/localazy.xml
@@ -15,6 +15,10 @@
   </plurals>
   <string name="notification_error_unified_push_unregistered_android">"The UnifiedPush notification distributor couldn\'t be registered, so you will not receive notifications anymore. Please check the notifications settings of the app and the status of the push distributor."</string>
   <string name="notification_fallback_content">"You have new messages."</string>
+  <plurals name="notification_fallback_n_content">
+    <item quantity="one">"You have %d new message."</item>
+    <item quantity="other">"You have %d new messages."</item>
+  </plurals>
   <string name="notification_incoming_call">"📹 Incoming call"</string>
   <string name="notification_inline_reply_failed">"** Failed to send - please open room"</string>
   <string name="notification_invitation_action_join">"Join"</string>
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultActiveNotificationsProviderTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultActiveNotificationsProviderTest.kt
index 573ec37471..04a65073f6 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultActiveNotificationsProviderTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultActiveNotificationsProviderTest.kt
@@ -153,6 +153,19 @@ class DefaultActiveNotificationsProviderTest {
         assertThat(activeNotificationsProvider.getSummaryNotification(A_SESSION_ID_2)).isNull()
     }
 
+    @Test
+    fun `getFallbackNotification returns only the fallback notification for that session id if it exists`() {
+        val activeNotifications = listOf(
+            aStatusBarNotification(id = notificationIdProvider.getFallbackNotificationId(A_SESSION_ID), groupId = A_SESSION_ID.value),
+            aStatusBarNotification(id = notificationIdProvider.getSummaryNotificationId(A_SESSION_ID), groupId = A_SESSION_ID.value),
+            aStatusBarNotification(id = notificationIdProvider.getRoomInvitationNotificationId(A_SESSION_ID_2), groupId = A_SESSION_ID_2.value),
+        )
+        val activeNotificationsProvider = createActiveNotificationsProvider(activeNotifications = activeNotifications)
+
+        assertThat(activeNotificationsProvider.getFallbackNotification(A_SESSION_ID)).isNotNull()
+        assertThat(activeNotificationsProvider.getFallbackNotification(A_SESSION_ID_2)).isNull()
+    }
+
     private fun aStatusBarNotification(id: Int, groupId: String, tag: String? = null) = mockk<StatusBarNotification> {
         every { this@mockk.id } returns id
         every { this@mockk.tag } returns tag
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt
index 58f97e55cb..ba58db2a3c 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt
@@ -56,7 +56,6 @@ import io.element.android.libraries.push.impl.notifications.model.NotifiableMess
 import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEvent
 import io.element.android.libraries.push.test.notifications.FakeCallNotificationEventResolver
 import io.element.android.services.toolbox.impl.strings.AndroidStringProvider
-import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP
 import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
 import kotlinx.coroutines.test.runTest
@@ -663,7 +662,7 @@ class DefaultNotifiableEventResolverTest {
                 roomId = A_ROOM_ID,
                 eventId = AN_EVENT_ID,
                 editedEventId = null,
-                description = "You have new messages.",
+                description = "",
                 canBeReplaced = true,
                 isRedacted = false,
                 isUpdated = false,
@@ -895,7 +894,6 @@ class DefaultNotifiableEventResolverTest {
             callNotificationEventResolver = callNotificationEventResolver,
             fallbackNotificationFactory = FallbackNotificationFactory(
                 clock = FakeSystemClock(),
-                stringProvider = FakeStringProvider(defaultResult = "You have new messages.")
             ),
             featureFlagService = FakeFeatureFlagService(),
         )
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt
index 58bb86e683..608c45e9b8 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt
@@ -37,7 +37,6 @@ import io.element.android.services.appnavstate.api.AppNavigationStateService
 import io.element.android.services.appnavstate.api.NavigationState
 import io.element.android.services.appnavstate.test.FakeAppNavigationStateService
 import io.element.android.services.appnavstate.test.aNavigationState
-import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.tests.testutils.lambda.any
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
@@ -224,7 +223,6 @@ class DefaultNotificationDrawerManagerTest {
                     roomGroupMessageCreator = roomGroupMessageCreator,
                     summaryGroupMessageCreator = summaryGroupMessageCreator,
                     activeNotificationsProvider = activeNotificationsProvider,
-                    stringProvider = FakeStringProvider(),
                 ),
                 enterpriseService = enterpriseService,
                 sessionStore = sessionStore,
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultSummaryGroupMessageCreatorTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultSummaryGroupMessageCreatorTest.kt
index 01537fe09a..0973ee69ce 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultSummaryGroupMessageCreatorTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultSummaryGroupMessageCreatorTest.kt
@@ -47,7 +47,6 @@ class DefaultSummaryGroupMessageCreatorTest {
             ),
             invitationNotifications = emptyList(),
             simpleNotifications = emptyList(),
-            fallbackNotifications = emptyList(),
         )
 
         notificationCreator.createSummaryListNotificationResult.assertions()
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactoryTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactoryTest.kt
index 2cd066ea71..c07c1ff89e 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactoryTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactoryTest.kt
@@ -23,7 +23,6 @@ import io.element.android.libraries.push.impl.notifications.fake.FakeSummaryGrou
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
 import io.element.android.libraries.push.impl.notifications.fixtures.aSimpleNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.fixtures.anInviteNotifiableEvent
-import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -47,7 +46,6 @@ class NotificationDataFactoryTest {
         roomGroupMessageCreator = fakeRoomGroupMessageCreator,
         summaryGroupMessageCreator = fakeSummaryGroupMessageCreator,
         activeNotificationsProvider = activeNotificationsProvider,
-        stringProvider = FakeStringProvider(),
     )
 
     @Test
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRendererTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRendererTest.kt
index 957d199138..db292fcc61 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRendererTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRendererTest.kt
@@ -29,7 +29,6 @@ import io.element.android.libraries.push.impl.notifications.fixtures.anInviteNot
 import io.element.android.libraries.push.impl.notifications.model.NotifiableEvent
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
-import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import kotlinx.coroutines.test.runTest
@@ -57,7 +56,6 @@ class NotificationRendererTest {
         roomGroupMessageCreator = roomGroupMessageCreator,
         summaryGroupMessageCreator = summaryGroupMessageCreator,
         activeNotificationsProvider = FakeActiveNotificationsProvider(),
-        stringProvider = FakeStringProvider(),
     )
     private val notificationIdProvider = NotificationIdProvider
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt
index 0504ae433b..a346aa839f 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt
@@ -82,19 +82,22 @@ class DefaultNotificationCreatorTest {
     fun `test createFallbackNotification`() {
         val sut = createNotificationCreator()
         val result = sut.createFallbackNotification(
+            existingNotification = null,
             notificationAccountParams = aNotificationAccountParams(),
-            FallbackNotifiableEvent(
-                sessionId = A_SESSION_ID,
-                roomId = A_ROOM_ID,
-                eventId = AN_EVENT_ID,
-                editedEventId = null,
-                description = "description",
-                canBeReplaced = false,
-                isRedacted = false,
-                isUpdated = false,
-                timestamp = A_FAKE_TIMESTAMP,
-                cause = null,
-            ),
+            fallbackNotifiableEvents = listOf(
+                FallbackNotifiableEvent(
+                    sessionId = A_SESSION_ID,
+                    roomId = A_ROOM_ID,
+                    eventId = AN_EVENT_ID,
+                    editedEventId = null,
+                    description = "description",
+                    canBeReplaced = false,
+                    isRedacted = false,
+                    isUpdated = false,
+                    timestamp = A_FAKE_TIMESTAMP,
+                    cause = null,
+                ),
+            )
         )
         result.commonAssertions(
             expectedCategory = null,
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeActiveNotificationsProvider.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeActiveNotificationsProvider.kt
index ae3edce437..2b374e5ac1 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeActiveNotificationsProvider.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeActiveNotificationsProvider.kt
@@ -21,6 +21,7 @@ class FakeActiveNotificationsProvider(
     private val getMembershipNotificationForSessionResult: (SessionId) -> List<StatusBarNotification> = { emptyList() },
     private val getMembershipNotificationForRoomResult: (SessionId, RoomId) -> List<StatusBarNotification> = { _, _ -> emptyList() },
     private val getSummaryNotificationResult: (SessionId) -> StatusBarNotification? = { null },
+    private val getFallbackNotificationResult: (SessionId) -> StatusBarNotification? = { null },
     private val countResult: (SessionId) -> Int = { 0 },
 ) : ActiveNotificationsProvider {
     override fun getMessageNotificationsForRoom(sessionId: SessionId, roomId: RoomId, threadId: ThreadId?): List<StatusBarNotification> {
@@ -47,6 +48,10 @@ class FakeActiveNotificationsProvider(
         return getSummaryNotificationResult(sessionId)
     }
 
+    override fun getFallbackNotification(sessionId: SessionId): StatusBarNotification? {
+        return getFallbackNotificationResult(sessionId)
+    }
+
     override fun count(sessionId: SessionId): Int {
         return countResult(sessionId)
     }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationCreator.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationCreator.kt
index d5e4ad9695..33071ef1ac 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationCreator.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationCreator.kt
@@ -24,6 +24,7 @@ import io.element.android.libraries.push.impl.notifications.model.SimpleNotifiab
 import io.element.android.tests.testutils.lambda.LambdaFiveParamsRecorder
 import io.element.android.tests.testutils.lambda.LambdaListAnyParamsRecorder
 import io.element.android.tests.testutils.lambda.LambdaOneParamRecorder
+import io.element.android.tests.testutils.lambda.LambdaThreeParamsRecorder
 import io.element.android.tests.testutils.lambda.LambdaTwoParamsRecorder
 import io.element.android.tests.testutils.lambda.lambdaAnyRecorder
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -34,8 +35,8 @@ class FakeNotificationCreator(
         lambdaRecorder { _, _ -> A_NOTIFICATION },
     var createSimpleNotificationResult: LambdaTwoParamsRecorder<NotificationAccountParams, SimpleNotifiableEvent, Notification> =
         lambdaRecorder { _, _ -> A_NOTIFICATION },
-    var createFallbackNotificationResult: LambdaTwoParamsRecorder<NotificationAccountParams, FallbackNotifiableEvent, Notification> =
-        lambdaRecorder { _, _ -> A_NOTIFICATION },
+    var createFallbackNotificationResult: LambdaThreeParamsRecorder<Notification?, NotificationAccountParams, List<FallbackNotifiableEvent>, Notification> =
+        lambdaRecorder { _, _, _ -> A_NOTIFICATION },
     var createSummaryListNotificationResult: LambdaFiveParamsRecorder<
         NotificationAccountParams, String, Boolean, Long, NotificationAccountParams, Notification
         > = lambdaRecorder { _, _, _, _, _ -> A_NOTIFICATION },
@@ -75,10 +76,15 @@ class FakeNotificationCreator(
     }
 
     override fun createFallbackNotification(
+        existingNotification: Notification?,
         notificationAccountParams: NotificationAccountParams,
-        fallbackNotifiableEvent: FallbackNotifiableEvent,
+        fallbackNotifiableEvents: List<FallbackNotifiableEvent>,
     ): Notification {
-        return createFallbackNotificationResult(notificationAccountParams, fallbackNotifiableEvent)
+        return createFallbackNotificationResult(
+            existingNotification,
+            notificationAccountParams,
+            fallbackNotifiableEvents,
+        )
     }
 
     override fun createSummaryListNotification(
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationDataFactory.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationDataFactory.kt
index 009513b640..32c50ed7fd 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationDataFactory.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationDataFactory.kt
@@ -19,7 +19,7 @@ import io.element.android.libraries.push.impl.notifications.model.FallbackNotifi
 import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.NotifiableMessageEvent
 import io.element.android.libraries.push.impl.notifications.model.SimpleNotifiableEvent
-import io.element.android.tests.testutils.lambda.LambdaFiveParamsRecorder
+import io.element.android.tests.testutils.lambda.LambdaFourParamsRecorder
 import io.element.android.tests.testutils.lambda.LambdaOneParamRecorder
 import io.element.android.tests.testutils.lambda.LambdaThreeParamsRecorder
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -28,18 +28,17 @@ class FakeNotificationDataFactory(
     var messageEventToNotificationsResult: LambdaThreeParamsRecorder<
         List<NotifiableMessageEvent>, ImageLoader, NotificationAccountParams, List<RoomNotification>
         > = lambdaRecorder { _, _, _ -> emptyList() },
-    var summaryToNotificationsResult: LambdaFiveParamsRecorder<
+    var summaryToNotificationsResult: LambdaFourParamsRecorder<
         List<RoomNotification>,
         List<OneShotNotification>,
         List<OneShotNotification>,
-        List<OneShotNotification>,
         NotificationAccountParams,
         SummaryNotification
-        > = lambdaRecorder { _, _, _, _, _ -> SummaryNotification.Update(A_NOTIFICATION) },
+        > = lambdaRecorder { _, _, _, _ -> SummaryNotification.Update(A_NOTIFICATION) },
     var inviteToNotificationsResult: LambdaOneParamRecorder<List<InviteNotifiableEvent>, List<OneShotNotification>> = lambdaRecorder { _ -> emptyList() },
     var simpleEventToNotificationsResult: LambdaOneParamRecorder<List<SimpleNotifiableEvent>, List<OneShotNotification>> = lambdaRecorder { _ -> emptyList() },
-    var fallbackEventToNotificationsResult: LambdaOneParamRecorder<List<FallbackNotifiableEvent>, List<OneShotNotification>> =
-        lambdaRecorder { _ -> emptyList() },
+    var fallbackEventToNotificationsResult: LambdaOneParamRecorder<List<FallbackNotifiableEvent>, OneShotNotification?> =
+        lambdaRecorder { _ -> null },
 ) : NotificationDataFactory {
     override suspend fun toNotifications(
         messages: List<NotifiableMessageEvent>,
@@ -69,10 +68,10 @@ class FakeNotificationDataFactory(
 
     @JvmName("toNotificationFallbackEvents")
     @Suppress("INAPPLICABLE_JVM_NAME")
-    override fun toNotifications(
+    override fun toNotification(
         fallback: List<FallbackNotifiableEvent>,
         notificationAccountParams: NotificationAccountParams,
-    ): List<OneShotNotification> {
+    ): OneShotNotification? {
         return fallbackEventToNotificationsResult(fallback)
     }
 
@@ -80,14 +79,12 @@ class FakeNotificationDataFactory(
         roomNotifications: List<RoomNotification>,
         invitationNotifications: List<OneShotNotification>,
         simpleNotifications: List<OneShotNotification>,
-        fallbackNotifications: List<OneShotNotification>,
         notificationAccountParams: NotificationAccountParams,
     ): SummaryNotification {
         return summaryToNotificationsResult(
             roomNotifications,
             invitationNotifications,
             simpleNotifications,
-            fallbackNotifications,
             notificationAccountParams,
         )
     }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeSummaryGroupMessageCreator.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeSummaryGroupMessageCreator.kt
index 9db6853408..8bf309cd7b 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeSummaryGroupMessageCreator.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeSummaryGroupMessageCreator.kt
@@ -14,27 +14,25 @@ import io.element.android.libraries.push.impl.notifications.RoomNotification
 import io.element.android.libraries.push.impl.notifications.SummaryGroupMessageCreator
 import io.element.android.libraries.push.impl.notifications.factories.NotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.fixtures.A_NOTIFICATION
-import io.element.android.tests.testutils.lambda.LambdaFiveParamsRecorder
+import io.element.android.tests.testutils.lambda.LambdaFourParamsRecorder
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 
 class FakeSummaryGroupMessageCreator(
-    var createSummaryNotificationResult: LambdaFiveParamsRecorder<
-        NotificationAccountParams, List<RoomNotification>, List<OneShotNotification>, List<OneShotNotification>, List<OneShotNotification>, Notification> =
-        lambdaRecorder { _, _, _, _, _ -> A_NOTIFICATION }
+    var createSummaryNotificationResult: LambdaFourParamsRecorder<
+        NotificationAccountParams, List<RoomNotification>, List<OneShotNotification>, List<OneShotNotification>, Notification> =
+        lambdaRecorder { _, _, _, _ -> A_NOTIFICATION }
 ) : SummaryGroupMessageCreator {
     override fun createSummaryNotification(
         notificationAccountParams: NotificationAccountParams,
         roomNotifications: List<RoomNotification>,
         invitationNotifications: List<OneShotNotification>,
         simpleNotifications: List<OneShotNotification>,
-        fallbackNotifications: List<OneShotNotification>,
     ): Notification {
         return createSummaryNotificationResult(
             notificationAccountParams,
             roomNotifications,
             invitationNotifications,
             simpleNotifications,
-            fallbackNotifications,
         )
     }
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt
index 7c95034985..043f996205 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt
@@ -57,7 +57,6 @@ import io.element.android.libraries.pushstore.test.userpushstore.clientsecret.Fa
 import io.element.android.libraries.workmanager.api.WorkManagerRequest
 import io.element.android.libraries.workmanager.test.FakeWorkManagerScheduler
 import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
-import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
 import io.element.android.tests.testutils.lambda.any
 import io.element.android.tests.testutils.lambda.lambdaError
@@ -724,7 +723,6 @@ class DefaultPushHandlerTest {
             appCoroutineScope = backgroundScope,
             fallbackNotificationFactory = FallbackNotificationFactory(
                 clock = FakeSystemClock(),
-                stringProvider = FakeStringProvider(),
             ),
             syncOnNotifiableEvent = syncOnNotifiableEvent,
             featureFlagService = featureFlagService,