diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiver.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiver.kt
index e912b58f03..2c29765d55 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiver.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiver.kt
@@ -57,24 +57,24 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
                 handleSmartReply(intent, context)
             actionIds.dismissRoom ->
                 intent.getStringExtra(KEY_ROOM_ID)?.asRoomId()?.let { roomId ->
-                    notificationDrawerManager.updateEvents { it.clearMessagesForRoom(sessionId, roomId) }
+                    notificationDrawerManager.clearMessagesForRoom(sessionId, roomId)
                 }
             actionIds.dismissSummary ->
                 notificationDrawerManager.clearAllEvents(sessionId)
             actionIds.markRoomRead ->
                 intent.getStringExtra(KEY_ROOM_ID)?.asRoomId()?.let { roomId ->
-                    notificationDrawerManager.updateEvents { it.clearMessagesForRoom(sessionId, roomId) }
+                    notificationDrawerManager.clearMessagesForRoom(sessionId, roomId)
                     handleMarkAsRead(sessionId, roomId)
                 }
             actionIds.join -> {
                 intent.getStringExtra(KEY_ROOM_ID)?.asRoomId()?.let { roomId ->
-                    notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(sessionId, roomId) }
+                    notificationDrawerManager.clearMemberShipNotificationForRoom(sessionId, roomId)
                     handleJoinRoom(sessionId, roomId)
                 }
             }
             actionIds.reject -> {
                 intent.getStringExtra(KEY_ROOM_ID)?.asRoomId()?.let { roomId ->
-                    notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(sessionId, roomId) }
+                    notificationDrawerManager.clearMemberShipNotificationForRoom(sessionId, roomId)
                     handleRejectRoom(sessionId, roomId)
                 }
             }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDrawerManager.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDrawerManager.kt
index 313706f054..4688a4a24c 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDrawerManager.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDrawerManager.kt
@@ -89,7 +89,7 @@ class NotificationDrawerManager @Inject constructor(
             is AppNavigationState.Space -> {}
             is AppNavigationState.Room -> {
                 // Cleanup notification for current room
-                onEnteringRoom(appNavigationState.parentSpace.parentSession.sessionId, appNavigationState.roomId)
+                clearMessagesForRoom(appNavigationState.parentSpace.parentSession.sessionId, appNavigationState.roomId)
             }
             is AppNavigationState.Thread -> {
                 onEnteringThread(
@@ -109,13 +109,7 @@ class NotificationDrawerManager @Inject constructor(
         return NotificationState(queuedEvents, renderedEvents)
     }
 
-    /**
-    Should be called as soon as a new event is ready to be displayed.
-    The notification corresponding to this event will not be displayed until
-    #refreshNotificationDrawer() is called.
-    Events might be grouped and there might not be one notification per event!
-     */
-    fun NotificationEventQueue.onNotifiableEventReceived(notifiableEvent: NotifiableEvent) {
+    private fun NotificationEventQueue.onNotifiableEventReceived(notifiableEvent: NotifiableEvent) {
         if (!pushDataStore.areNotificationEnabledForDevice()) {
             Timber.i("Notification are disabled for this device")
             return
@@ -136,23 +130,47 @@ class NotificationDrawerManager @Inject constructor(
         add(notifiableEvent)
     }
 
+    /**
+     * Should be called as soon as a new event is ready to be displayed.
+     * The notification corresponding to this event will not be displayed until
+     * #refreshNotificationDrawer() is called.
+     * Events might be grouped and there might not be one notification per event!
+     */
+    fun onNotifiableEventReceived(notifiableEvent: NotifiableEvent) {
+        updateEvents {
+            it.onNotifiableEventReceived(notifiableEvent)
+        }
+    }
+
     /**
      * Clear all known events and refresh the notification drawer.
      */
     fun clearAllEvents(sessionId: SessionId) {
-        updateEvents { it.clearMessagesForSession(sessionId) }
+        updateEvents {
+            it.clearMessagesForSession(sessionId)
+        }
     }
 
     /**
      * Should be called when the application is currently opened and showing timeline for the given roomId.
      * Used to ignore events related to that room (no need to display notification) and clean any existing notification on this room.
+     * Can also be called when a notification for this room is dismissed by the user.
      */
-    private fun onEnteringRoom(sessionId: SessionId, roomId: RoomId) {
+    fun clearMessagesForRoom(sessionId: SessionId, roomId: RoomId) {
         updateEvents {
             it.clearMessagesForRoom(sessionId, roomId)
         }
     }
 
+    /**
+     * Clear invitation notification for the provided room.
+     */
+    fun clearMemberShipNotificationForRoom(sessionId: SessionId, roomId: RoomId) {
+        updateEvents {
+            it.clearMemberShipNotificationForRoom(sessionId, roomId)
+        }
+    }
+
     /**
      * Should be called when the application is currently opened and showing timeline for the given threadId.
      * Used to ignore events related to that thread (no need to display notification) and clean any existing notification on this room.
@@ -175,7 +193,7 @@ class NotificationDrawerManager @Inject constructor(
         }
     }
 
-    fun updateEvents(action: NotificationDrawerManager.(NotificationEventQueue) -> Unit) {
+    private fun updateEvents(action: NotificationDrawerManager.(NotificationEventQueue) -> Unit) {
         notificationState.updateQueuedEvents(this) { queuedEvents, _ ->
             action(queuedEvents)
         }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/PushHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/PushHandler.kt
index 1c597c010c..b4c9716b62 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/PushHandler.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/PushHandler.kt
@@ -134,7 +134,7 @@ class PushHandler @Inject constructor(
                 return
             }
 
-            notificationDrawerManager.updateEvents { it.onNotifiableEventReceived(notificationData) }
+            notificationDrawerManager.onNotifiableEventReceived(notificationData)
         } catch (e: Exception) {
             Timber.tag(loggerTag.value).e(e, "## handleInternal() failed")
         }