diff --git a/CelesteNet.Client/Components/CelesteNetEmojiComponent.cs b/CelesteNet.Client/Components/CelesteNetEmojiComponent.cs
index cf10a06c..9aa48fff 100644
--- a/CelesteNet.Client/Components/CelesteNetEmojiComponent.cs
+++ b/CelesteNet.Client/Components/CelesteNetEmojiComponent.cs
@@ -98,6 +98,9 @@ public CelesteNetEmojiComponent(CelesteNetClientContext context, Game game)
         }
 
         public void Handle(CelesteNetConnection con, DataNetEmoji netemoji) {
+            if (Client?.Options?.AvatarsDisabled == true)
+                return;
+
             lock (Pending) {
                 // Get the emoji asset
                 if (!Pending.TryGetValue(netemoji.ID, out NetEmojiAsset? asset))