diff --git a/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs b/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs
index 793e89dff..0c54743a6 100644
--- a/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs
+++ b/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs
@@ -71,6 +71,8 @@ namespace Discord.Rest
         public MessageReference Reference { get; private set; }
         /// <inheritdoc />
         public MessageFlags? Flags { get; private set; }
+        /// <inheritdoc/>
+        public MessageType Type { get; private set; }
 
         internal RestMessage(BaseDiscordClient discord, ulong id, IMessageChannel channel, IUser author, MessageSource source)
             : base(discord, id)
@@ -88,6 +90,8 @@ namespace Discord.Rest
         }
         internal virtual void Update(Model model)
         {
+            Type = model.Type;
+
             if (model.Timestamp.IsSpecified)
                 _timestampTicks = model.Timestamp.Value.UtcTicks;
 
@@ -166,8 +170,6 @@ namespace Discord.Rest
         /// </returns>
         public override string ToString() => Content;
 
-        /// <inheritdoc />
-        MessageType IMessage.Type => MessageType.Default;
         IUser IMessage.Author => Author;
         /// <inheritdoc />
         IReadOnlyCollection<IAttachment> IMessage.Attachments => Attachments;
diff --git a/src/Discord.Net.Rest/Entities/Messages/RestSystemMessage.cs b/src/Discord.Net.Rest/Entities/Messages/RestSystemMessage.cs
index 89a651eb7..1c59d4f45 100644
--- a/src/Discord.Net.Rest/Entities/Messages/RestSystemMessage.cs
+++ b/src/Discord.Net.Rest/Entities/Messages/RestSystemMessage.cs
@@ -9,9 +9,6 @@ namespace Discord.Rest
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     public class RestSystemMessage : RestMessage, ISystemMessage
     {
-        /// <inheritdoc />
-        public MessageType Type { get; private set; }
-
         internal RestSystemMessage(BaseDiscordClient discord, ulong id, IMessageChannel channel, IUser author)
             : base(discord, id, channel, author, MessageSource.System)
         {
@@ -25,8 +22,6 @@ namespace Discord.Rest
         internal override void Update(Model model)
         {
             base.Update(model);
-
-            Type = model.Type;
         }
 
         private string DebuggerDisplay => $"{Author}: {Content} ({Id}, {Type})";