diff --git a/server/db/migrations.go b/server/db/migrations.go
index 6decad6..d19f395 100644
--- a/server/db/migrations.go
+++ b/server/db/migrations.go
@@ -132,3 +132,13 @@ var migrationUpdateTranscodePrefIDX = gormigrate.Migration{
 		return nil
 	},
 }
+
+var migrationAddAlbumIDX = gormigrate.Migration{
+	ID: "202004302006",
+	Migrate: func(tx *gorm.DB) error {
+		return tx.AutoMigrate(
+			Album{},
+		).
+			Error
+	},
+}
diff --git a/server/db/model.go b/server/db/model.go
index e09ca06..b6a1cec 100644
--- a/server/db/model.go
+++ b/server/db/model.go
@@ -77,7 +77,7 @@ type Track struct {
 	TagTrackNumber int    `sql:"default: null"`
 	TagDiscNumber  int    `sql:"default: null"`
 	TagGenre       *Genre
-	TagGenreID     int    `sql:"default: null; type:int REFERENCES genres(id) ON DELETE CASCADE"`
+	TagGenreID     int    `sql:"default: null; type:int REFERENCES genres(id)"`
 	TagBrainzID    string `sql:"default: null"`
 }
 
@@ -140,9 +140,9 @@ type Album struct {
 	ParentID      int    `sql:"default: null; type:int REFERENCES albums(id) ON DELETE CASCADE"`
 	Cover         string `sql:"default: null"`
 	TagArtist     *Artist
-	TagArtistID   int `sql:"default: null; type:int REFERENCES artists(id) ON DELETE CASCADE"`
+	TagArtistID   int `gorm:"index" sql:"default: null; type:int REFERENCES artists(id) ON DELETE CASCADE"`
 	TagGenre      *Genre
-	TagGenreID    int    `sql:"default: null; type:int REFERENCES genres(id) ON DELETE CASCADE"`
+	TagGenreID    int    `sql:"default: null; type:int"`
 	TagTitle      string `sql:"default: null"`
 	TagTitleUDec  string `sql:"default: null"`
 	TagBrainzID   string `sql:"default: null"`