diff --git a/server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupServerSettingsGenerator.kt b/server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupServerSettingsGenerator.kt
index f1570280..21c432be 100644
--- a/server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupServerSettingsGenerator.kt
+++ b/server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupServerSettingsGenerator.kt
@@ -70,7 +70,7 @@ object SettingsBackupServerSettingsGenerator {
             }
 
             appendLine(
-                "@ProtoNumber(${setting.protoNumber}) override var ${setting.name}: ${getSettingType(setting)},"
+                "@ProtoNumber(${setting.protoNumber}) override var ${setting.name}: ${getSettingType(setting)}? = null,"
                     .addIndentation(indentation),
             )
         }
diff --git a/server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupSettingsHandlerGenerator.kt b/server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupSettingsHandlerGenerator.kt
index 862f3310..747bdf1a 100644
--- a/server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupSettingsHandlerGenerator.kt
+++ b/server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupSettingsHandlerGenerator.kt
@@ -85,7 +85,7 @@ object SettingsBackupSettingsHandlerGenerator {
             appendLine(
                 "${setting.name} = SettingsRegistry.get(\"${setting.name}\")!!.typeInfo.restoreLegacy!!(".addIndentation(indentation * 4) +
                     "backupServerSettings.${setting.name}" +
-                    ") as ${getSettingType(setting, false)},",
+                    ") as? ${getSettingType(setting, false)},",
             )
         }
         appendLine("),".addIndentation(indentation * 3))
@@ -129,7 +129,7 @@ object SettingsBackupSettingsHandlerGenerator {
         if (setting.typeInfo.convertToBackupType != null) {
             return "SettingsRegistry.get(\"${setting.name}\")!!.typeInfo.convertToBackupType!!(" +
                 "serverConfig.${setting.name}.value" +
-                ") as ${getSettingType(setting, true)}"
+                ") as? ${getSettingType(setting, true)}"
         }
 
         return "serverConfig.${setting.name}.value"