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 d93fdafa9..2462ed2d5 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -2739,7 +2739,7 @@ class ChatController(args: Bundle) :
 
     fun updateAdapterAfterSendReaction(message: ChatMessage, emoji: String) {
         if (message.reactions == null) {
-            message.reactions = HashMap()
+            message.reactions = LinkedHashMap()
         }
 
         var amount = message.reactions[emoji]
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
index b66ae5cee..a6d7e1a51 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
@@ -41,6 +41,7 @@ import java.security.MessageDigest;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -94,7 +95,7 @@ public class ChatMessage implements MessageContentType, MessageContentType.Image
     @JsonField(name = "messageType")
     public String messageType;
     @JsonField(name = "reactions")
-    public HashMap<String, Integer> reactions;
+    public LinkedHashMap<String, Integer> reactions;
 
     public boolean isDownloadingVoiceMessage;
     public boolean resetVoiceMessage;