diff --git a/src/components/Channel/Channel.tsx b/src/components/Channel/Channel.tsx
index e7c6abbbf..dd925cf2c 100644
--- a/src/components/Channel/Channel.tsx
+++ b/src/components/Channel/Channel.tsx
@@ -934,9 +934,13 @@ const ChannelInner = <
 
   const updateMessage = (
     updatedMessage: MessageToSend<StreamChatGenerics> | StreamMessage<StreamChatGenerics>,
+    timestampChanged = true,
   ) => {
     // add the message to the local channel state
-    channel.state.addMessageSorted(updatedMessage as MessageResponse<StreamChatGenerics>, true);
+    channel.state.addMessageSorted(
+      updatedMessage as MessageResponse<StreamChatGenerics>,
+      timestampChanged,
+    );
 
     dispatch({
       channel,
diff --git a/src/components/Message/hooks/useReactionHandler.ts b/src/components/Message/hooks/useReactionHandler.ts
index 271421342..3c9281de6 100644
--- a/src/components/Message/hooks/useReactionHandler.ts
+++ b/src/components/Message/hooks/useReactionHandler.ts
@@ -93,7 +93,7 @@ export const useReactionHandler = <
     const tempMessage = createMessagePreview(add, newReaction, message);
 
     try {
-      updateMessage(tempMessage);
+      updateMessage(tempMessage, false);
       // @ts-expect-error
       thread?.upsertReplyLocally({ message: tempMessage });
 
@@ -102,10 +102,10 @@ export const useReactionHandler = <
         : await channel.deleteReaction(id, type);
 
       // seems useless as we're expecting WS event to come in and replace this anyway
-      updateMessage(messageResponse.message);
+      updateMessage(messageResponse.message, false);
     } catch (error) {
       // revert to the original message if the API call fails
-      updateMessage(message);
+      updateMessage(message, false);
       // @ts-expect-error
       thread?.upsertReplyLocally({ message });
     }
diff --git a/src/context/ChannelActionContext.tsx b/src/context/ChannelActionContext.tsx
index 36acea39f..fa4ace23c 100644
--- a/src/context/ChannelActionContext.tsx
+++ b/src/context/ChannelActionContext.tsx
@@ -95,7 +95,7 @@ export type ChannelActionContextValue<
   setQuotedMessage: React.Dispatch<
     React.SetStateAction<StreamMessage<StreamChatGenerics> | undefined>
   >;
-  updateMessage: (message: StreamMessage<StreamChatGenerics>) => void;
+  updateMessage: (message: StreamMessage<StreamChatGenerics>, timestampChanged?: boolean) => void;
 };
 
 export const ChannelActionContext = React.createContext<ChannelActionContextValue | undefined>(