diff --git a/packages/pl-fe/src/components/still-image.tsx b/packages/pl-fe/src/components/still-image.tsx
index 4ca3e767a..c84724fb9 100644
--- a/packages/pl-fe/src/components/still-image.tsx
+++ b/packages/pl-fe/src/components/still-image.tsx
@@ -34,7 +34,7 @@ const StillImage: React.FC<IStillImage> = ({
   const img = useRef<HTMLImageElement>(null);
 
   const hoverToPlay = (
-    src && !autoPlayGif && ((isGif && !src.endsWith('.png')) || src.endsWith('.gif') || src.startsWith('blob:'))
+    src && !autoPlayGif && ((isGif) || src.endsWith('.gif') || src.startsWith('blob:'))
   );
 
   const handleImageLoad = () => {
diff --git a/packages/pl-fe/src/components/ui/emoji/emoji.tsx b/packages/pl-fe/src/components/ui/emoji/emoji.tsx
index d760586e9..a65b3a566 100644
--- a/packages/pl-fe/src/components/ui/emoji/emoji.tsx
+++ b/packages/pl-fe/src/components/ui/emoji/emoji.tsx
@@ -28,7 +28,7 @@ const Emoji: React.FC<IEmoji> = (props): JSX.Element | null => {
       <StillImage
         alt={alt || emoji}
         src={src}
-        isGif
+        isGif={!src.endsWith('.png')}
         noGroup={noGroup}
         letterboxed
         {...rest}