diff --git a/user.go b/user.go
index 202f3b5..12c7301 100644
--- a/user.go
+++ b/user.go
@@ -1076,7 +1076,6 @@ func (user *User) bridgeGuild(guildID string, everything bool) error {
 	if guild == nil {
 		return errors.New("guild not found")
 	}
-	guild.AutoBridgeChannels = everything
 	meta, _ := user.Session.State.Guild(guildID)
 	err := guild.CreateMatrixRoom(user, meta)
 	if err != nil {
@@ -1092,6 +1091,8 @@ func (user *User) bridgeGuild(guildID string, everything bool) error {
 			}
 		}
 	}
+	guild.AutoBridgeChannels = everything
+	guild.Update()
 
 	return nil
 }