diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
index 7ec6f184ff..92cc86db2c 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
@@ -255,10 +255,6 @@ class RoomDetailFragment @Inject constructor(
         roomDetailViewModel.subscribe { renderState(it) }
         roomDetailViewModel.sendMessageResultLiveData.observeEvent(viewLifecycleOwner) { renderSendMessageResult(it) }
 
-        roomDetailViewModel.nonBlockingPopAlert.observeEvent(this) { pair ->
-            val message = getString(pair.first, *pair.second.toTypedArray())
-            showSnackWithMessage(message, Snackbar.LENGTH_LONG)
-        }
         sharedActionViewModel
                 .observe()
                 .subscribe {
@@ -313,6 +309,7 @@ class RoomDetailFragment @Inject constructor(
                 is RoomDetailViewEvents.OnNewTimelineEvents -> scrollOnNewMessageCallback.addNewTimelineEventIds(it.eventIds)
                 is RoomDetailViewEvents.ActionSuccess       -> displayRoomDetailActionSuccess(it)
                 is RoomDetailViewEvents.ActionFailure       -> displayRoomDetailActionFailure(it)
+                is RoomDetailViewEvents.ShowMessage         -> showSnackWithMessage(it.message, Snackbar.LENGTH_LONG)
             }.exhaustive
         }
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt
index 13e77d1974..96ca7bf24e 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt
@@ -27,4 +27,6 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
 
     data class ActionSuccess(val action: RoomDetailAction) : RoomDetailViewEvents()
     data class ActionFailure(val action: RoomDetailAction, val throwable: Throwable) : RoomDetailViewEvents()
+
+    data class ShowMessage(val message: String) : RoomDetailViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
index fda6e44771..f42baff59e 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
@@ -314,10 +314,6 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
     }
 
     // TODO Cleanup this and use ViewEvents
-    private val _nonBlockingPopAlert = MutableLiveData<LiveEvent<Pair<Int, List<Any>>>>()
-    val nonBlockingPopAlert: LiveData<LiveEvent<Pair<Int, List<Any>>>>
-        get() = _nonBlockingPopAlert
-
     private val _sendMessageResultLiveData = MutableLiveData<LiveEvent<SendMessageResult>>()
     val sendMessageResultLiveData: LiveData<LiveEvent<SendMessageResult>>
         get() = _sendMessageResultLiveData