diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/room_aliases_table.go b/src/github.com/matrix-org/dendrite/roomserver/storage/room_aliases_table.go
index 09e1b181c..a060a1b50 100644
--- a/src/github.com/matrix-org/dendrite/roomserver/storage/room_aliases_table.go
+++ b/src/github.com/matrix-org/dendrite/roomserver/storage/room_aliases_table.go
@@ -67,6 +67,9 @@ func (s *roomAliasesStatements) insertRoomAlias(alias string, roomID string) (er
 
 func (s *roomAliasesStatements) selectRoomIDFromAlias(alias string) (roomID string, err error) {
 	err = s.selectRoomIDFromAliasStmt.QueryRow(alias).Scan(&roomID)
+	if err == sql.ErrNoRows {
+		return "", nil
+	}
 	return
 }