diff --git a/Jellyfin.Server/Migrations/MigrationRunner.cs b/Jellyfin.Server/Migrations/MigrationRunner.cs
index 7a881be0f6..3941700655 100644
--- a/Jellyfin.Server/Migrations/MigrationRunner.cs
+++ b/Jellyfin.Server/Migrations/MigrationRunner.cs
@@ -18,7 +18,7 @@ namespace Jellyfin.Server.Migrations
         {
             typeof(Routines.DisableTranscodingThrottling),
             typeof(Routines.CreateUserLoggingConfigFile),
-            typeof(Routines.RemoveBuggedExtras)
+            typeof(Routines.RemoveDuplicateExtras)
         };
 
         /// <summary>
diff --git a/Jellyfin.Server/Migrations/Routines/RemoveBuggedExtras.cs b/Jellyfin.Server/Migrations/Routines/RemoveDuplicateExtras.cs
similarity index 61%
rename from Jellyfin.Server/Migrations/Routines/RemoveBuggedExtras.cs
rename to Jellyfin.Server/Migrations/Routines/RemoveDuplicateExtras.cs
index 512bec0bf7..46de2d5c39 100644
--- a/Jellyfin.Server/Migrations/Routines/RemoveBuggedExtras.cs
+++ b/Jellyfin.Server/Migrations/Routines/RemoveDuplicateExtras.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.IO;
 
 using MediaBrowser.Controller;
@@ -16,7 +17,7 @@ namespace Jellyfin.Server.Migrations.Routines
         private readonly ILogger _logger;
         private readonly IServerApplicationPaths _paths;
 
-        public RemoveBuggedExtras(ILogger<RemoveBuggedExtras> logger, IServerApplicationPaths paths)
+        public RemoveDuplicateExtras(ILogger<RemoveDuplicateExtras> logger, IServerApplicationPaths paths)
         {
             _logger = logger;
             _paths = paths;
@@ -26,14 +27,15 @@ namespace Jellyfin.Server.Migrations.Routines
         public Guid Id => Guid.Parse("{ACBE17B7-8435-4A83-8B64-6FCF162CB9BD}");
 
         /// <inheritdoc/>
-        public string Name => "RemoveBuggedExtras";
+        public string Name => "RemoveDuplicateExtras";
 
         /// <inheritdoc/>
         public void Perform()
         {
             var dataPath = _paths.DataPath;
+            var dbPath = Path.Combine(dataPath, DbFilename);
             using (var connection = SQLite3.Open(
-                Path.Combine(dataPath, DbFilename),
+                dbPath,
                 ConnectionFlags.ReadWrite,
                 null))
             {
@@ -41,6 +43,25 @@ namespace Jellyfin.Server.Migrations.Routines
                 var bads = string.Join(", ", queryResult.SelectScalarString());
                 if (bads.Length != 0)
                 {
+                    _logger.LogInformation("Found duplicate extras, making {Library} backup", DbFilename);
+                    for (int i = 1; ; i++)
+                    {
+                        var bakPath = string.Format(CultureInfo.InvariantCulture, "{0}.bak{1}", dbPath, i);
+                        if (!File.Exists(bakPath))
+                        {
+                            try
+                            {
+                                File.Copy(dbPath, bakPath);
+                                break;
+                            }
+                            catch (Exception ex)
+                            {
+                                _logger.LogError(ex, "Cannot make a backup of {Library}", DbFilename);
+                                throw;
+                            }
+                        }
+                    }
+
                     _logger.LogInformation("Removing found duplicated extras for the following items: {DuplicateExtras}", bads);
                     connection.Execute("DELETE FROM TypedBaseItems WHERE rowid IN (SELECT t1.rowid FROM TypedBaseItems AS t1, TypedBaseItems AS t2 WHERE t1.Path=t2.Path AND t1.Type!=t2.Type AND t1.Type='MediaBrowser.Controller.Entities.Video')");
                 }