diff --git a/src/bot.ts b/src/bot.ts
index f36b309166952d4c108d21c8d5a7f1cd41f47228..47c18ade8ec5f60c7789b7b8afdf85666ed66936 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -209,13 +209,14 @@ export class DiscordBot {
         msg = [msg];
     }
     msg.forEach((m: Discord.Message) => {
-      log.verbose("DiscordBot", "Sent ", msg);
+      log.verbose("DiscordBot", "Sent ", m);
       this.sentMessages.push(m.id);
       const evt = new DbEvent();
       evt.MatrixId = event.event_id;
       evt.DiscordId = m.id;
-      evt.GuildId = m.guild.id;
-      evt.ChannelId = m.channel.id;
+      // Webhooks don't send guild info.
+      evt.GuildId = guildId;
+      evt.ChannelId = channelId;
       this.store.Insert(evt);
     });
     return;