diff --git a/src/components/middle/HeaderPinnedMessage.tsx b/src/components/middle/HeaderPinnedMessage.tsx
index 736f228b7..b24ebc1ce 100644
--- a/src/components/middle/HeaderPinnedMessage.tsx
+++ b/src/components/middle/HeaderPinnedMessage.tsx
@@ -105,12 +105,14 @@ const HeaderPinnedMessage: FC<OwnProps> = ({
           ariaLabel={lang('EventLogFilterPinnedMessages')}
           onClick={!shouldShowLoader ? onAllPinnedClick : undefined}
         >
-          <Spinner
-            color="blue"
-            className={buildClassName(
-              styles.loading, styles.pinListIcon, !shouldShowLoader && styles.pinListIconHidden,
-            )}
-          />
+          {isLoading && (
+            <Spinner
+              color="blue"
+              className={buildClassName(
+                styles.loading, styles.pinListIcon, !shouldShowLoader && styles.pinListIconHidden,
+              )}
+            />
+          )}
           <i
             className={buildClassName(
               'icon-pin-list', styles.pinListIcon, shouldShowLoader && styles.pinListIconHidden,
diff --git a/src/components/middle/MiddleHeader.tsx b/src/components/middle/MiddleHeader.tsx
index 61c33d3cb..d28941307 100644
--- a/src/components/middle/MiddleHeader.tsx
+++ b/src/components/middle/MiddleHeader.tsx
@@ -270,7 +270,7 @@ const MiddleHeader: FC<OwnProps & StateProps> = ({
   const {
     shouldRender: shouldRenderPinnedMessage,
     transitionClassNames: pinnedMessageClassNames,
-  } = useShowTransition(Boolean(pinnedMessage));
+  } = useShowTransition(Boolean(pinnedMessage), undefined, true);
 
   const renderingPinnedMessage = useCurrentOrPrev(pinnedMessage, true);
   const renderingPinnedMessagesCount = useCurrentOrPrev(pinnedMessagesCount, true);