diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 1f9a9925c..c261081cf 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -2722,6 +2722,10 @@ class ChatController(args: Bundle) :
     }
 
     fun updateAdapterAfterSendReaction(message: ChatMessage, emoji: String) {
+        if (message.reactions == null){
+            message.reactions = HashMap()
+        }
+
         var amount = message.reactions[emoji]
         if (amount == null){
             amount = 0