diff --git a/bridge/gitter/gitter.go b/bridge/gitter/gitter.go
index b5beac40..af71d892 100644
--- a/bridge/gitter/gitter.go
+++ b/bridge/gitter/gitter.go
@@ -58,8 +58,9 @@ func (b *Bgitter) JoinChannel(channel string) error {
 	}
 	room, err := b.c.GetRoom(roomID)
 	if err != nil {
-		b.Rooms = append(b.Rooms, *room)
+		return err
 	}
+	b.Rooms = append(b.Rooms, *room)
 	user, err := b.c.GetUser()
 	if err != nil {
 		return err