diff --git a/typings/index.d.ts b/typings/index.d.ts
index b432fcb6b..eea94c94c 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -1408,8 +1408,8 @@ export class Message<Cached extends boolean = boolean> extends Base {
   public editedTimestamp: number | null;
   public embeds: MessageEmbed[];
   public groupActivityApplication: ClientApplication | null;
-  public guildId: Snowflake | null;
-  public readonly guild: Guild | null;
+  public guildId: If<Cached, Snowflake>;
+  public readonly guild: If<Cached, Guild>;
   public readonly hasThread: boolean;
   public id: Snowflake;
   public interaction: MessageInteraction | null;
diff --git a/typings/index.test-d.ts b/typings/index.test-d.ts
index 36c0891e8..5dba199c7 100644
--- a/typings/index.test-d.ts
+++ b/typings/index.test-d.ts
@@ -533,6 +533,8 @@ client.on('messageCreate', async message => {
     const buttonCollector = message.createMessageComponentCollector({ componentType: 'BUTTON' });
     expectType<InteractionCollector<ButtonInteraction<'cached'>>>(buttonCollector);
     expectType<GuildTextBasedChannel>(message.channel);
+    expectType<Guild>(message.guild);
+    expectType<GuildMember | null>(message.member);
   }
 
   expectType<TextBasedChannels>(message.channel);