diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
index 7b388f3e..08a01370 100644
--- a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
+++ b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
@@ -1048,7 +1048,7 @@ namespace Discord.WebSocket
         {
             var model = await InteractionHelper.CreateGuildCommandAsync(Discord, Id, properties, options);
 
-            var entity = Discord.State.GetOrAddCommand(model.Id, (id) => SocketApplicationCommand.Create(Discord, model));
+            var entity = Discord.State.GetOrAddCommand(model.Id, (id) => SocketApplicationCommand.Create(Discord, model, Id));
 
             entity.Update(model);
 
@@ -1068,7 +1068,7 @@ namespace Discord.WebSocket
         {
             var models = await InteractionHelper.BulkOverwriteGuildCommandsAsync(Discord, Id, properties, options);
 
-            var entities = models.Select(x => SocketApplicationCommand.Create(Discord, x));
+            var entities = models.Select(x => SocketApplicationCommand.Create(Discord, x, Id));
 
             Discord.State.PurgeCommands(x => !x.IsGlobalCommand && x.Guild.Id == Id);
 
diff --git a/src/Discord.Net.WebSocket/Entities/Interaction/SocketBaseCommand/SocketApplicationCommand.cs b/src/Discord.Net.WebSocket/Entities/Interaction/SocketBaseCommand/SocketApplicationCommand.cs
index d32c4245..fe207ebd 100644
--- a/src/Discord.Net.WebSocket/Entities/Interaction/SocketBaseCommand/SocketApplicationCommand.cs
+++ b/src/Discord.Net.WebSocket/Entities/Interaction/SocketBaseCommand/SocketApplicationCommand.cs
@@ -146,6 +146,9 @@ namespace Discord.WebSocket
 
             IntegrationTypes = model.IntegrationTypes.GetValueOrDefault(null)?.ToImmutableArray();
             ContextTypes = model.ContextTypes.GetValueOrDefault(null)?.ToImmutableArray();
+
+            if (model.GuildId.IsSpecified)
+                GuildId = model.GuildId.Value;
         }
 
         /// <inheritdoc/>