diff --git a/API/Helpers/Converters/ServerSettingConverter.cs b/API/Helpers/Converters/ServerSettingConverter.cs
index c9d31f8c2..7adb5228f 100644
--- a/API/Helpers/Converters/ServerSettingConverter.cs
+++ b/API/Helpers/Converters/ServerSettingConverter.cs
@@ -130,9 +130,12 @@ public class ServerSettingConverter : ITypeConverter<IEnumerable<ServerSetting>,
                     destination.FirstInstallVersion = row.Value;
                     break;
                 case ServerSettingKey.LicenseKey:
-                    break;
+                case ServerSettingKey.EnableAuthentication:
+                case ServerSettingKey.EmailServiceUrl:
+                case ServerSettingKey.ConvertBookmarkToWebP:
+                case ServerSettingKey.ConvertCoverToWebP:
                 default:
-                    throw new ArgumentOutOfRangeException();
+                    break;
             }
         }
 
diff --git a/API/Program.cs b/API/Program.cs
index 925214920..544d568d1 100644
--- a/API/Program.cs
+++ b/API/Program.cs
@@ -106,6 +106,9 @@ public class Program
 
                                 // v0.8.2
                                 await ManualMigrateSwitchToWal.Migrate(context, logger);
+
+                                // v0.8.4
+                                await ManualMigrateEncodeSettings.Migrate(context, logger);
                             }
                             catch (Exception ex)
                             {
diff --git a/API/Startup.cs b/API/Startup.cs
index 7ab16c466..cf6c7ccfd 100644
--- a/API/Startup.cs
+++ b/API/Startup.cs
@@ -276,7 +276,6 @@ public class Startup
                     await ManualMigrateRemovePeople.Migrate(dataContext, logger);
                     await MigrateDuplicateDarkTheme.Migrate(dataContext, logger);
                     await ManualMigrateUnscrobbleBookLibraries.Migrate(dataContext, logger);
-                    await ManualMigrateEncodeSettings.Migrate(dataContext, logger);
 
                     //  Update the version in the DB after all migrations are run
                     var installVersion = await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.InstallVersion);
diff --git a/UI/Web/package-lock.json b/UI/Web/package-lock.json
index 64d798000..bd61901b5 100644
--- a/UI/Web/package-lock.json
+++ b/UI/Web/package-lock.json
@@ -9078,9 +9078,9 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "engines": {
         "node": ">=8.3.0"
       },