diff --git a/submodules/TelegramUI/Components/Chat/ChatButtonKeyboardInputNode/Sources/ChatButtonKeyboardInputNode.swift b/submodules/TelegramUI/Components/Chat/ChatButtonKeyboardInputNode/Sources/ChatButtonKeyboardInputNode.swift
index b5a68e6976c..79144ba0b03 100644
--- a/submodules/TelegramUI/Components/Chat/ChatButtonKeyboardInputNode/Sources/ChatButtonKeyboardInputNode.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatButtonKeyboardInputNode/Sources/ChatButtonKeyboardInputNode.swift
@@ -164,9 +164,9 @@ private final class ChatButtonKeyboardInputButtonNode: HighlightTrackingButtonNo
                         size: iconSize,
                         placeholderColor: theme.overallDarkAppearance ? UIColor(white: 1.0, alpha: 0.1) : UIColor(white: 0.0, alpha: 0.1),
                         themeColor: theme.list.itemPrimaryTextColor,
-                        loopMode: .count(0)
+                        loopMode: .forever
                     ),
-                    isVisibleForAnimations: true,
+                    isVisibleForAnimations: context.sharedContext.energyUsageSettings.loopEmoji,
                     action: nil
                 )),
                 environment: {},
diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageActionButtonsNode/Sources/ChatMessageActionButtonsNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageActionButtonsNode/Sources/ChatMessageActionButtonsNode.swift
index 4ee6c88de2c..c82bf1f18ea 100644
--- a/submodules/TelegramUI/Components/Chat/ChatMessageActionButtonsNode/Sources/ChatMessageActionButtonsNode.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatMessageActionButtonsNode/Sources/ChatMessageActionButtonsNode.swift
@@ -558,9 +558,9 @@ private final class ChatMessageActionButtonNode: ASDisplayNode {
                                     size: emojiIconSize,
                                     placeholderColor: theme.theme.overallDarkAppearance ? UIColor(white: 1.0, alpha: 0.1) : UIColor(white: 0.0, alpha: 0.1),
                                     themeColor: titleColor,
-                                    loopMode: .count(0)
+                                    loopMode: .forever
                                 ),
-                                isVisibleForAnimations: true,
+                                isVisibleForAnimations: context.sharedContext.energyUsageSettings.loopEmoji,
                                 action: nil
                             )),
                             environment: {},