From 7530f06deea63a03e0ca05f777f0f1582372c305 Mon Sep 17 00:00:00 2001
From: Echo <ChaosExAnima@users.noreply.github.com>
Date: Thu, 16 Oct 2025 14:46:17 +0200
Subject: [PATCH] Emoji: Fix autoplay incorrectly being applied (#36503)

---
 app/javascript/mastodon/components/emoji/context.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/emoji/context.tsx b/app/javascript/mastodon/components/emoji/context.tsx
index 9fda5714d97..730ae743ed9 100644
--- a/app/javascript/mastodon/components/emoji/context.tsx
+++ b/app/javascript/mastodon/components/emoji/context.tsx
@@ -63,7 +63,7 @@ export const AnimateEmojiProvider = polymorphicForwardRef<
 
     // If there's a parent context or GIFs autoplay, we don't need handlers.
     const parentContext = useContext(AnimateEmojiContext);
-    if (parentContext !== null || autoPlayGif === true) {
+    if (parentContext !== null) {
       return (
         <Wrapper
           {...props}