diff --git a/src/appservice/Appservice.ts b/src/appservice/Appservice.ts
index fa162818..e120138d 100644
--- a/src/appservice/Appservice.ts
+++ b/src/appservice/Appservice.ts
@@ -645,6 +645,7 @@ export class Appservice extends EventEmitter {
         if (domain !== botDomain) return; // can't be impersonated, so don't try
 
         const intent = this.getIntentForUserId(event['state_key']);
+        await intent.ensureRegistered();
 
         const targetMembership = event["content"]["membership"];
         if (targetMembership === "join") {