diff --git a/client/pages/config/backups.vue b/client/pages/config/backups.vue
index f7845119..44a92f2e 100644
--- a/client/pages/config/backups.vue
+++ b/client/pages/config/backups.vue
@@ -170,7 +170,7 @@ export default {
         })
     },
     updateBackupsSettings() {
-      if (isNaN(this.maxBackupSize) || this.maxBackupSize <= 0) {
+      if (isNaN(this.maxBackupSize) || this.maxBackupSize < 0) {
         this.$toast.error('Invalid maximum backup size')
         return
       }
@@ -200,10 +200,9 @@ export default {
     },
     initServerSettings() {
       this.newServerSettings = this.serverSettings ? { ...this.serverSettings } : {}
-
       this.backupsToKeep = this.newServerSettings.backupsToKeep || 2
       this.enableBackups = !!this.newServerSettings.backupSchedule
-      this.maxBackupSize = this.newServerSettings.maxBackupSize || 1
+      this.maxBackupSize = this.newServerSettings.maxBackupSize === 0 ? 0 : this.newServerSettings.maxBackupSize || 1
       this.cronExpression = this.newServerSettings.backupSchedule || '30 1 * * *'
     }
   },
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index d7602e77..eb172828 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -229,7 +229,7 @@
   "LabelBackupLocation": "Backup Location",
   "LabelBackupsEnableAutomaticBackups": "Enable automatic backups",
   "LabelBackupsEnableAutomaticBackupsHelp": "Backups saved in /metadata/backups",
-  "LabelBackupsMaxBackupSize": "Maximum backup size (in GB)",
+  "LabelBackupsMaxBackupSize": "Maximum backup size (in GB) (0 for unlimited)",
   "LabelBackupsMaxBackupSizeHelp": "As a safeguard against misconfiguration, backups will fail if they exceed the configured size.",
   "LabelBackupsNumberToKeep": "Number of backups to keep",
   "LabelBackupsNumberToKeepHelp": "Only 1 backup will be removed at a time so if you already have more backups than this you should manually remove them.",
diff --git a/server/managers/BackupManager.js b/server/managers/BackupManager.js
index 88772c58..13493952 100644
--- a/server/managers/BackupManager.js
+++ b/server/managers/BackupManager.js
@@ -42,7 +42,7 @@ class BackupManager {
   }
 
   get maxBackupSize() {
-    return global.ServerSettings.maxBackupSize || 1
+    return global.ServerSettings.maxBackupSize || Infinity
   }
 
   async init() {
@@ -419,14 +419,16 @@ class BackupManager {
         reject(err)
       })
       archive.on('progress', ({ fs: fsobj }) => {
-        const maxBackupSizeInBytes = this.maxBackupSize * 1000 * 1000 * 1000
-        if (fsobj.processedBytes > maxBackupSizeInBytes) {
-          Logger.error(`[BackupManager] Archiver is too large - aborting to prevent endless loop, Bytes Processed: ${fsobj.processedBytes}`)
-          archive.abort()
-          setTimeout(() => {
-            this.removeBackup(backup)
-            output.destroy('Backup too large') // Promise is reject in write stream error evt
-          }, 500)
+        if (this.maxBackupSize !== Infinity) {
+          const maxBackupSizeInBytes = this.maxBackupSize * 1000 * 1000 * 1000
+          if (fsobj.processedBytes > maxBackupSizeInBytes) {
+            Logger.error(`[BackupManager] Archiver is too large - aborting to prevent endless loop, Bytes Processed: ${fsobj.processedBytes}`)
+            archive.abort()
+            setTimeout(() => {
+              this.removeBackup(backup)
+              output.destroy('Backup too large') // Promise is reject in write stream error evt
+            }, 500)
+          }
         }
       })
 
diff --git a/server/objects/settings/ServerSettings.js b/server/objects/settings/ServerSettings.js
index 6ade11a9..6d070dcc 100644
--- a/server/objects/settings/ServerSettings.js
+++ b/server/objects/settings/ServerSettings.js
@@ -102,7 +102,7 @@ class ServerSettings {
     this.backupPath = settings.backupPath || Path.join(global.MetadataPath, 'backups')
     this.backupSchedule = settings.backupSchedule || false
     this.backupsToKeep = settings.backupsToKeep || 2
-    this.maxBackupSize = settings.maxBackupSize || 1
+    this.maxBackupSize = settings.maxBackupSize === 0 ? 0 : settings.maxBackupSize || 1
 
     this.loggerDailyLogsToKeep = settings.loggerDailyLogsToKeep || 7
     this.loggerScannerLogsToKeep = settings.loggerScannerLogsToKeep || 2