diff --git a/src/components/common/FullNameTitle.tsx b/src/components/common/FullNameTitle.tsx
index e63e9e158..a06f5f4e1 100644
--- a/src/components/common/FullNameTitle.tsx
+++ b/src/components/common/FullNameTitle.tsx
@@ -72,6 +72,7 @@ const FullNameTitle: FC<OwnProps> = ({
   const isUser = realPeer && isPeerUser(realPeer);
   const title = realPeer && (isUser ? getUserFullName(realPeer) : getChatTitle(lang, realPeer));
   const isPremium = isUser && realPeer.isPremium;
+  const canShowEmojiStatus = withEmojiStatus && !isSavedMessages && realPeer;
 
   const handleTitleClick = useLastCallback((e) => {
     if (!title || !canCopyTitle) {
@@ -126,7 +127,7 @@ const FullNameTitle: FC<OwnProps> = ({
         <>
           {!noVerified && peer?.isVerified && <VerifiedIcon />}
           {!noFake && peer?.fakeType && <FakeIcon fakeType={peer.fakeType} />}
-          {withEmojiStatus && realPeer?.emojiStatus && (
+          {canShowEmojiStatus && realPeer.emojiStatus && (
             <CustomEmoji
               documentId={realPeer.emojiStatus.documentId}
               size={emojiStatusSize}
@@ -135,7 +136,7 @@ const FullNameTitle: FC<OwnProps> = ({
               onClick={onEmojiStatusClick}
             />
           )}
-          {withEmojiStatus && !realPeer?.emojiStatus && isPremium && <StarIcon />}
+          {canShowEmojiStatus && !realPeer.emojiStatus && isPremium && <StarIcon />}
         </>
       )}
       {iconElement}
diff --git a/src/components/right/Profile.tsx b/src/components/right/Profile.tsx
index ff71f0745..f4776cd14 100644
--- a/src/components/right/Profile.tsx
+++ b/src/components/right/Profile.tsx
@@ -817,7 +817,7 @@ export default memo(withGlobal<OwnProps>(
     const storyByIds = peerStories?.byId;
     const archiveStoryIds = peerStories?.archiveIds;
 
-    const hasGiftsTab = Boolean(userFullInfo?.starGiftCount);
+    const hasGiftsTab = Boolean(userFullInfo?.starGiftCount) && !isSavedDialog;
     const userGifts = global.users.giftsById[chatId];
 
     return {