diff --git a/src/Discord.Net.Core/Entities/Messages/Emoji.cs b/src/Discord.Net.Core/Entities/Messages/Emoji.cs
index 0fdbc69e2..5750b7ed8 100644
--- a/src/Discord.Net.Core/Entities/Messages/Emoji.cs
+++ b/src/Discord.Net.Core/Entities/Messages/Emoji.cs
@@ -7,14 +7,16 @@ namespace Discord
         public ulong Id { get; }
         public string Name { get; }
         public int Index { get; }
+        public int Length { get; }
 
         public string Url => CDN.GetEmojiUrl(Id);
 
-        internal Emoji(ulong id, string name, int index)
+        internal Emoji(ulong id, string name, int index, int length)
         {
             Id = id;
             Name = name;
             Index = index;
+            Length = length;
         }
     }
 }
diff --git a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
index 085f73741..373c6bb52 100644
--- a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
+++ b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
@@ -45,7 +45,7 @@ namespace Discord.Rest
             {
                 ulong id;
                 if (ulong.TryParse(match.Groups[2].Value, NumberStyles.None, CultureInfo.InvariantCulture, out id))
-                    builder.Add(new Emoji(id, match.Groups[1].Value, match.Index));
+                    builder.Add(new Emoji(id, match.Groups[1].Value, match.Index, match.Length));
             }
             return builder.ToImmutable();
         }