diff --git a/app/javascript/mastodon/components/emoji/context.tsx b/app/javascript/mastodon/components/emoji/context.tsx
index 9fda5714d..730ae743e 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}