diff --git a/src/bot.ts b/src/bot.ts
index 8ddcf134cc2f83e7401d34c98f50a44d73b8fe1d..62ed5dfc126e65b353add31b40efdeb3a55f903e 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -231,7 +231,7 @@ export class DiscordBot {
       // Webhooks don't send guild info.
       evt.GuildId = guildId;
       evt.ChannelId = channelId;
-      this.store.Insert(evt);
+      return this.store.Insert(evt);
     });
     return;
   }
@@ -453,7 +453,7 @@ export class DiscordBot {
         evt.DiscordId = msgID;
         evt.ChannelId = chan.id;
         evt.GuildId = guild.id;
-        this.store.Insert(evt);
+        return this.store.Insert(evt);
       });
     });
 
@@ -585,6 +585,13 @@ export class DiscordBot {
               msgtype,
               url: content.mxcUrl,
               external_url: attachment.url,
+            }).then((res) => {
+              const evt = new DbEvent();
+              evt.MatrixId = res.event_id + ";" + room;
+              evt.DiscordId = msg.id;
+              evt.ChannelId = msg.channel.id;
+              evt.GuildId = msg.guild.id;
+              return this.store.Insert(evt);
             });
           });
         });
@@ -603,7 +610,7 @@ export class DiscordBot {
                     evt.DiscordId = msg.id;
                     evt.ChannelId = msg.channel.id;
                     evt.GuildId = msg.guild.id;
-                    this.store.Insert(evt);
+                    return this.store.Insert(evt);
                 });
             });
         });