diff --git a/keyserver/storage/postgres/key_changes_table.go b/keyserver/storage/postgres/key_changes_table.go
index 211e49c96..38b8a98a0 100644
--- a/keyserver/storage/postgres/key_changes_table.go
+++ b/keyserver/storage/postgres/key_changes_table.go
@@ -101,11 +101,8 @@ func executeMigration(ctx context.Context, db *sql.DB) error {
 		Version: migrationName,
 		Up:      deltas.UpRefactorKeyChanges,
 	})
-	if err = m.Up(ctx); err != nil {
-		return err
-	}
 
-	return nil
+	return m.Up(ctx)
 }
 
 func (s *keyChangesStatements) Prepare() (err error) {
diff --git a/roomserver/storage/postgres/storage.go b/roomserver/storage/postgres/storage.go
index de0b2ac0d..141d027ab 100644
--- a/roomserver/storage/postgres/storage.go
+++ b/roomserver/storage/postgres/storage.go
@@ -99,10 +99,8 @@ func executeMigration(ctx context.Context, db *sql.DB) error {
 		Version: migrationName,
 		Up:      deltas.UpStateBlocksRefactor,
 	})
-	if err = m.Up(ctx); err != nil {
-		return err
-	}
-	return nil
+
+	return m.Up(ctx)
 }
 
 func (d *Database) create(db *sql.DB) error {