diff --git a/src/components/middle/MiddleHeader.tsx b/src/components/middle/MiddleHeader.tsx
index 99faff837..9227ff6a0 100644
--- a/src/components/middle/MiddleHeader.tsx
+++ b/src/components/middle/MiddleHeader.tsx
@@ -134,15 +134,16 @@ const MiddleHeader: FC<OwnProps & StateProps & DispatchProps> = ({
     }
   }, [chatId, loadPinnedMessages, lastSyncTime, threadId]);
 
-  useEffect(() => {
-    setPinnedMessageIndex(0);
-  }, [chatId]);
-
-  // Modify index after unpinning
+  // Modify pinned index after unpinning
   useEffect(() => {
     setPinnedMessageIndex(pinnedMessagesCount ? cycleRestrict(pinnedMessagesCount, pinnedMessageIndex) : -1);
   }, [pinnedMessagesCount, pinnedMessageIndex]);
 
+  // Reset pinned index when switching chats
+  useEffect(() => {
+    setPinnedMessageIndex(0);
+  }, [chatId]);
+
   useEnsureMessage(chatId, pinnedMessageId, pinnedMessage);
 
   const { width: windowWidth } = useWindowSize();