diff --git a/matrix/matrix.go b/matrix/matrix.go
index ed50f95..f77a257 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -760,7 +760,7 @@ func (c *Container) JoinRoom(roomID, server string) (*rooms.Room, error) {
 		return nil, err
 	}
 
-	room := c.GetRoom(resp.RoomID)
+	room := c.GetOrCreateRoom(resp.RoomID)
 	room.HasLeft = false
 	return room, nil
 }