diff --git a/src/Discord.Net.Core/Entities/Emotes/GuildEmote.cs b/src/Discord.Net.Core/Entities/Emotes/GuildEmote.cs
index 9affb1e89..a41939390 100644
--- a/src/Discord.Net.Core/Entities/Emotes/GuildEmote.cs
+++ b/src/Discord.Net.Core/Entities/Emotes/GuildEmote.cs
@@ -30,12 +30,20 @@ namespace Discord
         ///     A read-only list containing snowflake identifiers for roles that are allowed to use this emoji.
         /// </returns>
         public IReadOnlyList<ulong> RoleIds { get; }
+        /// <summary>
+        ///     Gets the user Id that created this emoji.
+        /// </summary>
+        /// <returns>
+        ///     A User Id who created this emoji, which may be null.
+        /// </returns>
+        public ulong? CreatorId { get; }
 
-        internal GuildEmote(ulong id, string name, bool animated, bool isManaged, bool requireColons, IReadOnlyList<ulong> roleIds) : base(id, name, animated)
+        internal GuildEmote(ulong id, string name, bool animated, bool isManaged, bool requireColons, IReadOnlyList<ulong> roleIds, ulong? userId) : base(id, name, animated)
         {
             IsManaged = isManaged;
             RequireColons = requireColons;
             RoleIds = roleIds;
+            CreatorId = userId;
         }
 
         private string DebuggerDisplay => $"{Name} ({Id})";
diff --git a/src/Discord.Net.Rest/Extensions/EntityExtensions.cs b/src/Discord.Net.Rest/Extensions/EntityExtensions.cs
index 74b05dacd..6e3b109e4 100644
--- a/src/Discord.Net.Rest/Extensions/EntityExtensions.cs
+++ b/src/Discord.Net.Rest/Extensions/EntityExtensions.cs
@@ -1,4 +1,4 @@
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 using System.Linq;
 
 namespace Discord.Rest
@@ -7,7 +7,7 @@ namespace Discord.Rest
     {
         public static GuildEmote ToEntity(this API.Emoji model)
         {
-            return new GuildEmote(model.Id.Value, model.Name, model.Animated.GetValueOrDefault(), 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), model.User.IsSpecified ? model.User.Value.Id : (ulong?)null);
         }
 
         public static Embed ToEntity(this API.Embed model)