diff --git a/bridge/portal.go b/bridge/portal.go
index 27f5bd4..0fbdae8 100644
--- a/bridge/portal.go
+++ b/bridge/portal.go
@@ -172,14 +172,14 @@ func (p *Portal) MainIntent() *appservice.IntentAPI {
 }
 
 func (p *Portal) createMatrixRoom(user *User, channel *discordgo.Channel) error {
+	p.roomCreateLock.Lock()
+	defer p.roomCreateLock.Unlock()
+
 	// If we have a matrix id the room should exist so we have nothing to do.
 	if p.MXID != "" {
 		return nil
 	}
 
-	p.roomCreateLock.Lock()
-	defer p.roomCreateLock.Unlock()
-
 	p.Type = channel.Type
 	if p.Type == discordgo.ChannelTypeDM {
 		p.DMUser = channel.Recipients[0].ID