diff --git a/src/components/middle/message/ReactionSelector.tsx b/src/components/middle/message/ReactionSelector.tsx
index 1b9013eb3..6c799ca83 100644
--- a/src/components/middle/message/ReactionSelector.tsx
+++ b/src/components/middle/message/ReactionSelector.tsx
@@ -7,6 +7,7 @@ import { ApiAvailableReaction, ApiMediaFormat } from '../../../api/types';
 import useMedia from '../../../hooks/useMedia';
 import useHorizontalScroll from '../../../hooks/useHorizontalScroll';
 import useFlag from '../../../hooks/useFlag';
+import useShowTransition from '../../../hooks/useShowTransition';
 import { getTouchY } from '../../../util/scrollLock';
 
 import ReactionStaticEmoji from '../../common/ReactionStaticEmoji';
@@ -31,10 +32,18 @@ const AvailableReaction: FC<{
 }> = ({ reaction, onSendReaction, isReady }) => {
   // eslint-disable-next-line no-null/no-null
   const containerRef = useRef<HTMLDivElement>(null);
-  const [isActivated, activate, deactivate] = useFlag();
+
   const mediaData = useMedia(`document${reaction.selectAnimation?.id}`, !isReady, ApiMediaFormat.Lottie);
+
+  const [isActivated, activate, deactivate] = useFlag();
   const [isAnimationLoaded, markAnimationLoaded] = useFlag();
 
+  const shouldRenderAnimated = Boolean(isReady && mediaData);
+  const { transitionClassNames: animatedClassNames } = useShowTransition(shouldRenderAnimated);
+  const { shouldRender: shouldRenderStatic, transitionClassNames: staticClassNames } = useShowTransition(
+    !isReady || !isAnimationLoaded, undefined, true,
+  );
+
   function handleClick() {
     if (!containerRef.current) return;
     const { x, y } = containerRef.current.getBoundingClientRect();
@@ -42,10 +51,6 @@ const AvailableReaction: FC<{
     onSendReaction(reaction.reaction, x, y);
   }
 
-  const shouldRenderPreview = !isAnimationLoaded;
-  const shouldRenderAnimated = mediaData;
-  const shouldPlay = isReady && isActivated;
-
   return (
     <div
       className="reaction"
@@ -53,16 +58,19 @@ const AvailableReaction: FC<{
       ref={containerRef}
       onMouseEnter={isReady ? activate : undefined}
     >
-      {shouldRenderPreview && <ReactionStaticEmoji reaction={reaction.reaction} />}
+      {shouldRenderStatic && (
+        <ReactionStaticEmoji className={isReady ? staticClassNames : undefined} reaction={reaction.reaction} />
+      )}
       {shouldRenderAnimated && (
         <AnimatedSticker
           id={`select_${reaction.reaction}`}
+          className={animatedClassNames}
           animationData={mediaData as AnyLiteral}
-          play={shouldPlay}
+          play={isActivated}
           noLoop
-          onEnded={deactivate}
           size={REACTION_SIZE}
           onLoad={markAnimationLoaded}
+          onEnded={deactivate}
         />
       )}
     </div>
diff --git a/src/hooks/useShowTransition.ts b/src/hooks/useShowTransition.ts
index 4f7f02c8d..ec2e0e028 100644
--- a/src/hooks/useShowTransition.ts
+++ b/src/hooks/useShowTransition.ts
@@ -27,7 +27,7 @@ export default (
     setHasOpenClassName(false);
 
     if (!isClosed && !closeTimeoutRef.current) {
-      closeTimeoutRef.current = window.setTimeout(() => {
+      const exec = () => {
         setIsClosed(true);
 
         if (onCloseTransitionEnd) {
@@ -35,7 +35,13 @@ export default (
         }
 
         closeTimeoutRef.current = undefined;
-      }, noCloseTransition ? 0 : CLOSE_DURATION);
+      };
+
+      if (noCloseTransition) {
+        exec();
+      } else {
+        closeTimeoutRef.current = window.setTimeout(exec, CLOSE_DURATION);
+      }
     }
   }