diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go
index 5788933e4..e35a44132 100644
--- a/internal/manager/config/config.go
+++ b/internal/manager/config/config.go
@@ -237,7 +237,7 @@ const (
 	DisableDropdownCreateMovie     = "disable_dropdown_create.movie"
 	DisableDropdownCreateGallery   = "disable_dropdown_create.gallery"
 
-	DisableAutoTagWarning = "disable_auto_tag_warning"
+	DisableAutoTagWarning = "auto_tag.disable_warning"
 
 	HandyKey                       = "handy_key"
 	FunscriptOffset                = "funscript_offset"
diff --git a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
index 6fd2f2a29..8846809d6 100644
--- a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
@@ -204,7 +204,8 @@ export const LibraryTasks: React.FC = () => {
 
   const onAutoTagClick = useAutoTagTrigger(
     () => runAutoTag(),
-    () => setDialogOpen({ autoTagAlert: true })
+    () => setDialogOpen({ autoTagAlert: true }),
+    iface.disableAutoTagWarning
   );
 
   function renderScanDialog() {
diff --git a/ui/v2.5/src/hooks/useAutoTagTrigger.ts b/ui/v2.5/src/hooks/useAutoTagTrigger.ts
index 5ce7d7579..ed34104b7 100644
--- a/ui/v2.5/src/hooks/useAutoTagTrigger.ts
+++ b/ui/v2.5/src/hooks/useAutoTagTrigger.ts
@@ -1,17 +1,19 @@
+import { useCallback } from "react";
 import { useConfigurationContext } from "./Config";
 
-// Centralises the "skip warning" check so every entry point to auto tag
-// consults the same interface flag.
 export function useAutoTagTrigger(
   onRun: () => void,
-  onOpenConfirm: () => void
+  onOpenConfirm: () => void,
+  override?: boolean | null
 ) {
   const { configuration } = useConfigurationContext();
-  return () => {
-    if (configuration?.interface.disableAutoTagWarning) {
+  const disabled =
+    override ?? configuration?.interface.disableAutoTagWarning ?? false;
+  return useCallback(() => {
+    if (disabled) {
       onRun();
       return;
     }
     onOpenConfirm();
-  };
+  }, [disabled, onRun, onOpenConfirm]);
 }