diff --git a/src/components/appMenu/BatchCountEdit.vue b/src/components/appMenu/BatchCountEdit.vue
index 82860326c..c362aaa98 100644
--- a/src/components/appMenu/BatchCountEdit.vue
+++ b/src/components/appMenu/BatchCountEdit.vue
@@ -31,8 +31,10 @@
 
 <script lang="ts" setup>
 import { useQueueSettingsStore } from '@/stores/queueStore'
+import { useSettingStore } from '@/stores/settingStore'
 import { storeToRefs } from 'pinia'
 import InputNumber from 'primevue/inputnumber'
+import { computed } from 'vue'
 
 interface Props {
   class?: string
@@ -45,7 +47,11 @@ const props = withDefaults(defineProps<Props>(), {
 const queueSettingsStore = useQueueSettingsStore()
 const { batchCount } = storeToRefs(queueSettingsStore)
 const minQueueCount = 1
-const maxQueueCount = 100
+
+const settingStore = useSettingStore()
+const maxQueueCount = computed(() =>
+  settingStore.get('Comfy.QueueButton.BatchCountLimit')
+)
 
 const handleClick = (increment: boolean) => {
   let newCount: number
diff --git a/src/stores/coreSettings.ts b/src/stores/coreSettings.ts
index acdc4bd13..6b82fc961 100644
--- a/src/stores/coreSettings.ts
+++ b/src/stores/coreSettings.ts
@@ -386,5 +386,14 @@ export const CORE_SETTINGS: SettingParams[] = [
     name: 'Show graph canvas menu',
     type: 'boolean',
     defaultValue: true
+  },
+  {
+    id: 'Comfy.QueueButton.BatchCountLimit',
+    name: 'Batch count limit',
+    tooltip:
+      'The maximum number of tasks added to the queue at one button click',
+    type: 'number',
+    defaultValue: 100,
+    versionAdded: '1.3.5'
   }
 ]
diff --git a/src/types/apiTypes.ts b/src/types/apiTypes.ts
index 080a7bc7c..08116ac97 100644
--- a/src/types/apiTypes.ts
+++ b/src/types/apiTypes.ts
@@ -503,7 +503,8 @@ const zSettings = z.record(z.any()).and(
       'Comfy.Window.UnloadConfirmation': z.boolean(),
       'Comfy.NodeBadge.NodeSourceBadgeMode': zNodeBadgeMode,
       'Comfy.NodeBadge.NodeIdBadgeMode': zNodeBadgeMode,
-      'Comfy.NodeBadge.NodeLifeCycleBadgeMode': zNodeBadgeMode
+      'Comfy.NodeBadge.NodeLifeCycleBadgeMode': zNodeBadgeMode,
+      'Comfy.QueueButton.BatchCountLimit': z.number()
     })
     .optional()
 )
diff --git a/src/types/settingTypes.ts b/src/types/settingTypes.ts
index dcf6d95a7..e242b78bb 100644
--- a/src/types/settingTypes.ts
+++ b/src/types/settingTypes.ts
@@ -47,4 +47,8 @@ export interface SettingParams {
   deprecated?: boolean
   // Deprecated values are mapped to new values.
   migrateDeprecatedValue?: (value: any) => any
+  // Version of the setting when it was added
+  versionAdded?: string
+  // Version of the setting when it was last modified
+  versionModified?: string
 }