diff --git a/src/ARKServerManager/App.xaml.cs b/src/ARKServerManager/App.xaml.cs
index 929ce8fa..f9e72920 100644
--- a/src/ARKServerManager/App.xaml.cs
+++ b/src/ARKServerManager/App.xaml.cs
@@ -561,14 +561,12 @@ namespace ServerManagerTool
             CommonConfig.Default.Reload();
 
             var installFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            var backupFolder = includeBackup
-                ? string.IsNullOrWhiteSpace(Config.Default.BackupPath)
+            var backupFolder = string.IsNullOrWhiteSpace(Config.Default.BackupPath)
                         ? Path.Combine(Config.Default.DataDir, Config.Default.BackupDir)
-                        : Path.Combine(Config.Default.BackupPath)
-                : null;
+                        : Path.Combine(Config.Default.BackupPath);
 
-            SettingsUtils.BackupUserConfigSettings(Config.Default, "userconfig.json", installFolder, backupFolder);
-            SettingsUtils.BackupUserConfigSettings(CommonConfig.Default, "commonconfig.json", installFolder, backupFolder);
+            SettingsUtils.BackupUserConfigSettings(Config.Default, "userconfig.json", installFolder, includeBackup ? backupFolder : null);
+            SettingsUtils.BackupUserConfigSettings(CommonConfig.Default, "commonconfig.json", installFolder, includeBackup ? backupFolder : null);
 
             SettingsUtils.DeleteBackupUserConfigFiles("userconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL);
             SettingsUtils.DeleteBackupUserConfigFiles("commonconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL);
diff --git a/src/ConanServerManager/App.xaml.cs b/src/ConanServerManager/App.xaml.cs
index 27a503ab..8c91c8b7 100644
--- a/src/ConanServerManager/App.xaml.cs
+++ b/src/ConanServerManager/App.xaml.cs
@@ -550,14 +550,12 @@ namespace ServerManagerTool
             CommonConfig.Default.Reload();
 
             var installFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            var backupFolder = includeBackup
-                ? string.IsNullOrWhiteSpace(Config.Default.BackupPath)
+            var backupFolder = string.IsNullOrWhiteSpace(Config.Default.BackupPath)
                         ? Path.Combine(Config.Default.DataPath, Config.Default.BackupRelativePath)
-                        : Path.Combine(Config.Default.BackupPath)
-                : null;
+                        : Path.Combine(Config.Default.BackupPath);
 
-            SettingsUtils.BackupUserConfigSettings(Config.Default, "userconfig.json", installFolder, backupFolder);
-            SettingsUtils.BackupUserConfigSettings(CommonConfig.Default, "commonconfig.json", installFolder, backupFolder);
+            SettingsUtils.BackupUserConfigSettings(Config.Default, "userconfig.json", installFolder, includeBackup ? backupFolder : null);
+            SettingsUtils.BackupUserConfigSettings(CommonConfig.Default, "commonconfig.json", installFolder, includeBackup ? backupFolder : null);
 
             SettingsUtils.DeleteBackupUserConfigFiles("userconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL);
             SettingsUtils.DeleteBackupUserConfigFiles("commonconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL);
diff --git a/src/ServerManager.Common/Utils/SettingsUtils.cs b/src/ServerManager.Common/Utils/SettingsUtils.cs
index a57d277b..6a966e1f 100644
--- a/src/ServerManager.Common/Utils/SettingsUtils.cs
+++ b/src/ServerManager.Common/Utils/SettingsUtils.cs
@@ -53,15 +53,15 @@ namespace ServerManagerTool.Common.Utils
 
         public static void DeleteBackupUserConfigFiles(string fileName, string backupPath, int interval)
         {
+            var backupFileName = Path.GetFileNameWithoutExtension(fileName);
+            var backupFileExt = Path.GetExtension(fileName);
+            var backupFileFilter = $"{backupFileName}_*{backupFileExt}";
+            var backupDateFilter = DateTime.Now.AddDays(-interval);
+
             try
             {
                 Debug.WriteLine("Deleting old config backup files started...");
 
-                var backupFileName = Path.GetFileNameWithoutExtension(fileName);
-                var backupFileExt = Path.GetExtension(fileName);
-                var backupFileFilter = $"{backupFileName}_*{backupFileExt}";
-                var backupDateFilter = DateTime.Now.AddDays(-interval);
-
                 var filesToDelete = new DirectoryInfo(backupPath).GetFiles(backupFileFilter).Where(f => f.LastWriteTime < backupDateFilter);
                 foreach (var fileToDelete in filesToDelete)
                 {
@@ -78,7 +78,7 @@ namespace ServerManagerTool.Common.Utils
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"Error deleting old server backup files.\r\n{ex.Message}");
+                Debug.WriteLine($"Error deleting old config backup files.\r\n{ex.Message}");
             }
             finally
             {