diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 473a993395..7461b89001 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -641,9 +641,11 @@ class RoomDetailFragment @Inject constructor(
                     }
                 }
                 .setOnEmojiPopupDismissListener {
-                    views.composerLayout.views.composerEmojiButton.apply {
-                        contentDescription = getString(R.string.a11y_open_emoji_picker)
-                        setImageResource(R.drawable.ic_insert_emoji)
+                    if (isAdded) {
+                        views.composerLayout.views.composerEmojiButton.apply {
+                            contentDescription = getString(R.string.a11y_open_emoji_picker)
+                            setImageResource(R.drawable.ic_insert_emoji)
+                        }
                     }
                 }
                 .build(views.composerLayout.views.composerEditText)