diff --git a/userapi/storage/postgres/storage.go b/userapi/storage/postgres/storage.go
index 8f8bb95b7..c7342616a 100644
--- a/userapi/storage/postgres/storage.go
+++ b/userapi/storage/postgres/storage.go
@@ -15,6 +15,8 @@
 package postgres
 
 import (
+	"context"
+	"database/sql"
 	"fmt"
 	"time"
 
@@ -43,15 +45,13 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
 		Up:      deltas.UpRenameTables,
 		Down:    deltas.DownRenameTables,
 	})
-	/*
-		m.AddMigrations(sqlutil.Migration{
-			Version: "userapi: server names",
-			Up: func(ctx context.Context, txn *sql.Tx) error {
-				return deltas.UpServerNames(ctx, txn, serverName)
-			},
-			Down: deltas.DownServerNames,
-		})
-	*/
+	m.AddMigrations(sqlutil.Migration{
+		Version: "userapi: server names",
+		Up: func(ctx context.Context, txn *sql.Tx) error {
+			return deltas.UpServerNames(ctx, txn, serverName)
+		},
+		Down: deltas.DownServerNames,
+	})
 	if err = m.Up(base.Context()); err != nil {
 		return nil, err
 	}
@@ -105,12 +105,6 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
 		return nil, fmt.Errorf("NewPostgresStatsTable: %w", err)
 	}
 
-	m = sqlutil.NewMigrator(db)
-
-	if err = m.Up(base.Context()); err != nil {
-		return nil, err
-	}
-
 	return &shared.Database{
 		AccountDatas:          accountDataTable,
 		Accounts:              accountsTable,
diff --git a/userapi/storage/sqlite3/storage.go b/userapi/storage/sqlite3/storage.go
index 1c6c7a8eb..2c1c2cab2 100644
--- a/userapi/storage/sqlite3/storage.go
+++ b/userapi/storage/sqlite3/storage.go
@@ -15,6 +15,8 @@
 package sqlite3
 
 import (
+	"context"
+	"database/sql"
 	"fmt"
 	"time"
 
@@ -41,15 +43,13 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
 		Up:      deltas.UpRenameTables,
 		Down:    deltas.DownRenameTables,
 	})
-	/*
-		m.AddMigrations(sqlutil.Migration{
-			Version: "userapi: server names",
-			Up: func(ctx context.Context, txn *sql.Tx) error {
-				return deltas.UpServerNames(ctx, txn, serverName)
-			},
-			Down: deltas.DownServerNames,
-		})
-	*/
+	m.AddMigrations(sqlutil.Migration{
+		Version: "userapi: server names",
+		Up: func(ctx context.Context, txn *sql.Tx) error {
+			return deltas.UpServerNames(ctx, txn, serverName)
+		},
+		Down: deltas.DownServerNames,
+	})
 	if err = m.Up(base.Context()); err != nil {
 		return nil, err
 	}
@@ -103,12 +103,6 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
 		return nil, fmt.Errorf("NewSQLiteStatsTable: %w", err)
 	}
 
-	m = sqlutil.NewMigrator(db)
-
-	if err = m.Up(base.Context()); err != nil {
-		return nil, err
-	}
-
 	return &shared.Database{
 		AccountDatas:          accountDataTable,
 		Accounts:              accountsTable,