2 files changed, 6 insertions, 6 deletions
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemConfiguration.cs
index ab5403271..b8419a59f 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemConfiguration.cs
@@ -35,7 +35,6 @@ public class BaseItemConfiguration : IEntityTypeConfiguration<BaseItemEntity>
         builder.HasIndex(e => e.ParentId);
         builder.HasIndex(e => e.PresentationUniqueKey);
         builder.HasIndex(e => new { e.Id, e.Type, e.IsFolder, e.IsVirtualItem });
-        builder.HasIndex(e => new { e.UserDataKey, e.Type });
 
         // covering index
         builder.HasIndex(e => new { e.TopParentId, e.Id });
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/UserDataConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/UserDataConfiguration.cs
index 1113adb7b..5ebdf8d59 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/UserDataConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/UserDataConfiguration.cs
@@ -13,10 +13,11 @@ public class UserDataConfiguration : IEntityTypeConfiguration<UserData>
     /// <inheritdoc/>
     public void Configure(EntityTypeBuilder<UserData> builder)
     {
-        builder.HasKey(d => new { d.Key, d.UserId });
-        builder.HasIndex(d => new { d.Key, d.UserId, d.Played });
-        builder.HasIndex(d => new { d.Key, d.UserId, d.PlaybackPositionTicks });
-        builder.HasIndex(d => new { d.Key, d.UserId, d.IsFavorite });
-        builder.HasIndex(d => new { d.Key, d.UserId, d.LastPlayedDate });
+        builder.HasKey(d => new { d.ItemId, d.UserId });
+        builder.HasIndex(d => new { d.ItemId, d.UserId, d.Played });
+        builder.HasIndex(d => new { d.ItemId, d.UserId, d.PlaybackPositionTicks });
+        builder.HasIndex(d => new { d.ItemId, d.UserId, d.IsFavorite });
+        builder.HasIndex(d => new { d.ItemId, d.UserId, d.LastPlayedDate });
+        builder.HasOne(e => e.Item);
     }
 }