diff --git a/src/qml/Component/Emoji/EmojiPicker.qml b/src/qml/Component/Emoji/EmojiPicker.qml
index 9f177096e..39060520e 100644
--- a/src/qml/Component/Emoji/EmojiPicker.qml
+++ b/src/qml/Component/Emoji/EmojiPicker.qml
@@ -17,6 +17,7 @@ ColumnLayout {
 
     property bool includeCustom: false
     property bool showQuickReaction: false
+    property NeoChatRoom currentRoom
 
     readonly property var currentEmojiModel: {
         if (includeCustom) {
diff --git a/src/qml/Dialog/EmojiDialog.qml b/src/qml/Dialog/EmojiDialog.qml
index 195d7bce4..64db15bc2 100644
--- a/src/qml/Dialog/EmojiDialog.qml
+++ b/src/qml/Dialog/EmojiDialog.qml
@@ -60,6 +60,7 @@ QQC2.Popup {
         currentRoom: root.currentRoom
         includeCustom: emojiPopup.includeCustom
         showQuickReaction: emojiPopup.showQuickReaction
+        currentRoom: RoomManager.currentRoom
         onChosen: {
             emojiPopup.chosen(emoji)
             if (emojiPopup.closeOnChosen) emojiPopup.close()