diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/sql.go b/src/github.com/matrix-org/dendrite/roomserver/storage/sql.go
index 2ab066ea4..a24dbb1d3 100644
--- a/src/github.com/matrix-org/dendrite/roomserver/storage/sql.go
+++ b/src/github.com/matrix-org/dendrite/roomserver/storage/sql.go
@@ -27,9 +27,9 @@ type statements struct {
 	stateSnapshotStatements
 	stateBlockStatements
 	previousEventStatements
+	roomAliasesStatements
 	inviteStatements
 	membershipStatements
-	roomAliasesStatements
 }
 
 func (s *statements) prepare(db *sql.DB) error {
@@ -44,6 +44,7 @@ func (s *statements) prepare(db *sql.DB) error {
 		s.stateSnapshotStatements.prepare,
 		s.stateBlockStatements.prepare,
 		s.previousEventStatements.prepare,
+		s.roomAliasesStatements.prepare,
 		s.inviteStatements.prepare,
 		s.membershipStatements.prepare,
 	} {
@@ -52,9 +53,5 @@ func (s *statements) prepare(db *sql.DB) error {
 		}
 	}
 
-	if err = s.roomAliasesStatements.prepare(db); err != nil {
-		return err
-	}
-
 	return nil
 }