diff --git a/DisCatSharp/EventArgs/Message/MessageCreateEventArgs.cs b/DisCatSharp/EventArgs/Message/MessageCreateEventArgs.cs
index b92d8532a..3f2ff2793 100644
--- a/DisCatSharp/EventArgs/Message/MessageCreateEventArgs.cs
+++ b/DisCatSharp/EventArgs/Message/MessageCreateEventArgs.cs
@@ -1,86 +1,83 @@
 // This file is part of the DisCatSharp project, based off DSharpPlus.
 //
 // Copyright (c) 2021-2022 AITSYS
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
 //
 // The above copyright notice and this permission notice shall be included in all
 // copies or substantial portions of the Software.
 //
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
 using System;
 using System.Collections.Generic;
 
 using DisCatSharp.Entities;
 
 namespace DisCatSharp.EventArgs;
 
 /// <summary>
 /// Represents arguments for <see cref="DiscordClient.MessageCreated"/> event.
 /// </summary>
 public class MessageCreateEventArgs : DiscordEventArgs
 {
 	/// <summary>
 	/// Gets the message that was created.
 	/// </summary>
 	public DiscordMessage Message { get; internal set; }
 
 	/// <summary>
 	/// Gets the channel this message belongs to.
 	/// </summary>
 	public DiscordChannel Channel
 		=> this.Message.Channel;
 
 	/// <summary>
 	/// Gets the guild this message belongs to.
 	/// </summary>
 	public DiscordGuild Guild
 		=> this.Channel.Guild;
 
 	/// <summary>
 	/// Gets the guild id in case it couldn't convert.
 	/// </summary>
 	public ulong? GuildId
 		=> this.Message.GuildId;
 
 	/// <summary>
 	/// Gets the author of the message.
 	/// </summary>
 	public DiscordUser Author
 		=> this.Message.Author;
 
 	/// <summary>
 	/// Gets the collection of mentioned users.
 	/// </summary>
 	public IReadOnlyList<DiscordUser> MentionedUsers { get; internal set; }
 
 	/// <summary>
 	/// Gets the collection of mentioned roles.
 	/// </summary>
 	public IReadOnlyList<DiscordRole> MentionedRoles { get; internal set; }
 
 	/// <summary>
 	/// Gets the collection of mentioned channels.
 	/// </summary>
 	public IReadOnlyList<DiscordChannel> MentionedChannels { get; internal set; }
 
 	/// <summary>
 	/// Initializes a new instance of the <see cref="MessageCreateEventArgs"/> class.
 	/// </summary>
-	internal MessageCreateEventArgs(IServiceProvider provider) : base(provider)
-	{
-		this.Message.Channel.GuildId = this.Message.GuildId;
-	}
+	internal MessageCreateEventArgs(IServiceProvider provider) : base(provider) { }
 }
diff --git a/DisCatSharp/EventArgs/Message/MessageUpdateEventArgs.cs b/DisCatSharp/EventArgs/Message/MessageUpdateEventArgs.cs
index 298e4c5a0..339397d25 100644
--- a/DisCatSharp/EventArgs/Message/MessageUpdateEventArgs.cs
+++ b/DisCatSharp/EventArgs/Message/MessageUpdateEventArgs.cs
@@ -1,91 +1,88 @@
 // This file is part of the DisCatSharp project, based off DSharpPlus.
 //
 // Copyright (c) 2021-2022 AITSYS
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
 //
 // The above copyright notice and this permission notice shall be included in all
 // copies or substantial portions of the Software.
 //
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
 using System;
 using System.Collections.Generic;
 
 using DisCatSharp.Entities;
 
 namespace DisCatSharp.EventArgs;
 
 /// <summary>
 /// Represents arguments for <see cref="DiscordClient.MessageUpdated"/> event.
 /// </summary>
 public class MessageUpdateEventArgs : DiscordEventArgs
 {
 	/// <summary>
 	/// Gets the message that was updated.
 	/// </summary>
 	public DiscordMessage Message { get; internal set; }
 
 	/// <summary>
 	/// Gets the message before it got updated. This property will be null if the message was not cached.
 	/// </summary>
 	public DiscordMessage MessageBefore { get; internal set; }
 
 	/// <summary>
 	/// Gets the channel this message belongs to.
 	/// </summary>
 	public DiscordChannel Channel
 		=> this.Message.Channel;
 
 	/// <summary>
 	/// Gets the guild this message belongs to.
 	/// </summary>
 	public DiscordGuild Guild
 		=> this.Channel.Guild;
 
 	/// <summary>
 	/// Gets the guild id in case it couldn't convert.
 	/// </summary>
 	public ulong? GuildId
 		=> this.Message.GuildId;
 
 	/// <summary>
 	/// Gets the author of the message.
 	/// </summary>
 	public DiscordUser Author
 		=> this.Message.Author;
 
 	/// <summary>
 	/// Gets the collection of mentioned users.
 	/// </summary>
 	public IReadOnlyList<DiscordUser> MentionedUsers { get; internal set; }
 
 	/// <summary>
 	/// Gets the collection of mentioned roles.
 	/// </summary>
 	public IReadOnlyList<DiscordRole> MentionedRoles { get; internal set; }
 
 	/// <summary>
 	/// Gets the collection of mentioned channels.
 	/// </summary>
 	public IReadOnlyList<DiscordChannel> MentionedChannels { get; internal set; }
 
 	/// <summary>
 	/// Initializes a new instance of the <see cref="MessageUpdateEventArgs"/> class.
 	/// </summary>
-	internal MessageUpdateEventArgs(IServiceProvider provider) : base(provider)
-	{
-		this.Message.Channel.GuildId = this.Message.GuildId;
-	}
+	internal MessageUpdateEventArgs(IServiceProvider provider) : base(provider) { }
 }