diff --git a/user.go b/user.go
index e39d15c5..705aadd7 100644
--- a/user.go
+++ b/user.go
@@ -192,6 +192,10 @@ func (br *SignalBridge) NewUser(dbUser *database.User) *User {
 }
 
 func (user *User) ensureInvited(intent *appservice.IntentAPI, roomID id.RoomID, isDirect bool) (ok bool) {
+	if user.bridge.StateStore.GetMembership(roomID, user.MXID) == event.MembershipJoin {
+		ok = true
+		return
+	}
 	extraContent := make(map[string]interface{})
 	if isDirect {
 		extraContent["is_direct"] = true