diff --git a/src/Discord.Net.Core/CDN.cs b/src/Discord.Net.Core/CDN.cs
index d3ade3722..5c6763d8c 100644
--- a/src/Discord.Net.Core/CDN.cs
+++ b/src/Discord.Net.Core/CDN.cs
@@ -19,8 +19,8 @@ namespace Discord
             => splashId != null ? $"{DiscordConfig.CDNUrl}splashes/{guildId}/{splashId}.jpg" : null;
         public static string GetChannelIconUrl(ulong channelId, string iconId)
             => iconId != null ? $"{DiscordConfig.CDNUrl}channel-icons/{channelId}/{iconId}.jpg" : null;
-        public static string GetEmojiUrl(ulong emojiId)
-            => $"{DiscordConfig.CDNUrl}emojis/{emojiId}.png";
+        public static string GetEmojiUrl(ulong emojiId, bool animated)
+            => $"{DiscordConfig.CDNUrl}emojis/{emojiId}.{(animated ? "gif" : "png")}";
 
         private static string FormatToExtension(ImageFormat format, string imageId)
         {
diff --git a/src/Discord.Net.Core/Entities/Emotes/Emote.cs b/src/Discord.Net.Core/Entities/Emotes/Emote.cs
index f498c818e..a07673e4e 100644
--- a/src/Discord.Net.Core/Entities/Emotes/Emote.cs
+++ b/src/Discord.Net.Core/Entities/Emotes/Emote.cs
@@ -16,13 +16,18 @@ namespace Discord
         /// The ID of this emote
         /// </summary>
         public ulong Id { get; }
+        /// <summary>
+        /// Is this emote animated?
+        /// </summary>
+        public bool Animated { get; }
         public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id);
-        public string Url => CDN.GetEmojiUrl(Id);
+        public string Url => CDN.GetEmojiUrl(Id, Animated);
 
-        internal Emote(ulong id, string name)
+        internal Emote(ulong id, string name, bool animated)
         {
             Id = id;
             Name = name;
+            Animated = animated;
         }
 
         public override bool Equals(object other)
@@ -59,7 +64,7 @@ namespace Discord
         public static bool TryParse(string text, out Emote result)
         {
             result = null;
-            if (text.Length >= 4 && text[0] == '<' && text[1] == ':' && text[text.Length - 1] == '>')
+            if (text.Length >= 4 && text[0] == '<' && (text[1] == ':' || (text[1] == 'a' && text[2] == ':')) && text[text.Length - 1] == '>')
             {
                 int splitIndex = text.IndexOf(':', 2);
                 if (splitIndex == -1)
@@ -69,7 +74,8 @@ namespace Discord
                     return false;
 
                 string name = text.Substring(2, splitIndex - 2);
-                result = new Emote(id, name);
+                bool animated = text[1] == 'a';
+                result = new Emote(id, name, animated);
                 return true;
             }
             return false;
@@ -77,6 +83,6 @@ namespace Discord
         }
 
         private string DebuggerDisplay => $"{Name} ({Id})";
-        public override string ToString() => $"<:{Name}:{Id}>";
+        public override string ToString() => $"<{(Animated ? "a" : "")}:{Name}:{Id}>";
     }
 }
diff --git a/src/Discord.Net.Core/Entities/Emotes/GuildEmote.cs b/src/Discord.Net.Core/Entities/Emotes/GuildEmote.cs
index 8d776a4cd..95b062bd2 100644
--- a/src/Discord.Net.Core/Entities/Emotes/GuildEmote.cs
+++ b/src/Discord.Net.Core/Entities/Emotes/GuildEmote.cs
@@ -13,7 +13,7 @@ namespace Discord
         public bool RequireColons { get; }
         public IReadOnlyList<ulong> RoleIds { get; }
 
-        internal GuildEmote(ulong id, string name, bool isManaged, bool requireColons, IReadOnlyList<ulong> roleIds) : base(id, name)
+        internal GuildEmote(ulong id, string name, bool animated, bool isManaged, bool requireColons, IReadOnlyList<ulong> roleIds) : base(id, name, animated)
         {
             IsManaged = isManaged;
             RequireColons = requireColons;
@@ -21,6 +21,6 @@ namespace Discord
         }
 
         private string DebuggerDisplay => $"{Name} ({Id})";
-        public override string ToString() => $"<:{Name}:{Id}>";
+        public override string ToString() => $"<{(Animated ? "a" : "")}:{Name}:{Id}>";
     }
 }
diff --git a/src/Discord.Net.Rest/API/Common/Emoji.cs b/src/Discord.Net.Rest/API/Common/Emoji.cs
index bd9c4d466..2bdfdcc36 100644
--- a/src/Discord.Net.Rest/API/Common/Emoji.cs
+++ b/src/Discord.Net.Rest/API/Common/Emoji.cs
@@ -9,6 +9,8 @@ namespace Discord.API
         public ulong? Id { get; set; }
         [JsonProperty("name")]
         public string Name { get; set; }
+        [JsonProperty("animated")]
+        public bool? Animated { get; set; }
         [JsonProperty("roles")]
         public ulong[] Roles { get; set; }
         [JsonProperty("require_colons")]
diff --git a/src/Discord.Net.Rest/Entities/Messages/RestReaction.cs b/src/Discord.Net.Rest/Entities/Messages/RestReaction.cs
index 05c817935..6d3f72419 100644
--- a/src/Discord.Net.Rest/Entities/Messages/RestReaction.cs
+++ b/src/Discord.Net.Rest/Entities/Messages/RestReaction.cs
@@ -18,7 +18,7 @@ namespace Discord.Rest
         {
             IEmote emote;
             if (model.Emoji.Id.HasValue)
-                emote = new Emote(model.Emoji.Id.Value, model.Emoji.Name);
+                emote = new Emote(model.Emoji.Id.Value, model.Emoji.Name, model.Emoji.Animated.GetValueOrDefault());
             else
                 emote = new Emoji(model.Emoji.Name);
             return new RestReaction(emote, model.Count, model.Me);
diff --git a/src/Discord.Net.Rest/Extensions/EntityExtensions.cs b/src/Discord.Net.Rest/Extensions/EntityExtensions.cs
index b88a5b515..74b05dacd 100644
--- a/src/Discord.Net.Rest/Extensions/EntityExtensions.cs
+++ b/src/Discord.Net.Rest/Extensions/EntityExtensions.cs
@@ -7,7 +7,7 @@ namespace Discord.Rest
     {
         public static GuildEmote ToEntity(this API.Emoji model)
         {
-            return new GuildEmote(model.Id.Value, model.Name, model.Managed, model.RequireColons, ImmutableArray.Create(model.Roles));
+            return new GuildEmote(model.Id.Value, model.Name, model.Animated.GetValueOrDefault(), model.Managed, model.RequireColons, ImmutableArray.Create(model.Roles));
         }
 
         public static Embed ToEntity(this API.Embed model)
diff --git a/src/Discord.Net.WebSocket/Entities/Messages/SocketReaction.cs b/src/Discord.Net.WebSocket/Entities/Messages/SocketReaction.cs
index 35bee9e68..e8fa17a35 100644
--- a/src/Discord.Net.WebSocket/Entities/Messages/SocketReaction.cs
+++ b/src/Discord.Net.WebSocket/Entities/Messages/SocketReaction.cs
@@ -24,7 +24,7 @@ namespace Discord.WebSocket
         {
             IEmote emote;
             if (model.Emoji.Id.HasValue)
-                emote = new Emote(model.Emoji.Id.Value, model.Emoji.Name);
+                emote = new Emote(model.Emoji.Id.Value, model.Emoji.Name, model.Emoji.Animated.GetValueOrDefault());
             else
                 emote = new Emoji(model.Emoji.Name);
             return new SocketReaction(channel, model.MessageId, message, model.UserId, user, emote);