diff --git a/eslint.config.mjs b/eslint.config.mjs
index 6afd37a0f..75d1f22e9 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -99,6 +99,7 @@ const jsConfig = defineConfig([
         idbAdd: 'readonly',
         idbCount: 'readonly',
         idbFolderCleanup: 'readonly',
+        idbClearAll: 'readonly',
         idbIsReady: 'readonly',
         initChangelog: 'readonly',
         sendNotification: 'readonly',
diff --git a/javascript/gallery.js b/javascript/gallery.js
index 4bebc3b1a..0054d69e8 100644
--- a/javascript/gallery.js
+++ b/javascript/gallery.js
@@ -1027,6 +1027,30 @@ function resetGalleryState(reason) {
   return controller;
 }
 
+function clearCacheIfDisabled(browser_cache) {
+  if (browser_cache === false) {
+    log('Thumbnail DB cleanup:', 'Image gallery cache setting disabled. Clearing cache.');
+    const controller = resetGalleryState('Clearing all thumbnails from cache');
+    maintenanceQueue.enqueue({
+      signal: controller.signal,
+      callback: async () => {
+        const cb_clearMsg = showCleaningMsg(0, true);
+        await idbClearAll(controller.signal)
+          .then(() => {
+            cb_clearMsg();
+            currentGalleryFolder = null;
+            el.clearCacheFolder.innerText = '<select a folder first>';
+            updateStatusWithSort('Thumbnail cache cleared');
+            log('Thumbnail DB cleanup: Cache cleared');
+          })
+          .catch((e) => {
+            SimpleFunctionQueue.abortLogger('Thumbnail DB cleanup:', e);
+          });
+      },
+    });
+  }
+}
+
 function folderCleanupRunner(evt) {
   evt.preventDefault();
   evt.stopPropagation();
@@ -1212,6 +1236,16 @@ async function setOverlayAnimation() {
   document.head.append(busyAnimation);
 }
 
+async function galleryClearInit() {
+  let galleryClearInitTimeout = 0;
+  const tryCleanupInit = setInterval(() => {
+    if (addCacheClearLabel() || galleryClearInitTimeout++ === 60) {
+      clearInterval(tryCleanupInit);
+      monitorOption('browser_cache', clearCacheIfDisabled);
+    }
+  }, 1000);
+}
+
 async function blockQueueUntilReady() {
   // Add block to maintenanceQueue until cache is ready
   maintenanceQueue.enqueue({
@@ -1243,6 +1277,7 @@ async function initGallery() { // triggered on gradio change to monitor when ui
   updateGalleryStyles();
   injectGalleryStatusCSS();
   setOverlayAnimation();
+  galleryClearInit();
   const progress = gradioApp().getElementById('tab-gallery-progress');
   if (progress) {
     galleryProgressBar.attachTo(progress);
@@ -1261,15 +1296,6 @@ async function initGallery() { // triggered on gradio change to monitor when ui
   monitorGalleries();
 }
 
-// Additional settings handling
-
-let galleryClearInitTimeout = 0;
-const tryCleanupInit = setInterval(() => {
-  if (addCacheClearLabel() || ++galleryClearInitTimeout === 60) {
-    clearInterval(tryCleanupInit);
-  }
-}, 1000);
-
 // register on startup
 
 customElements.define('gallery-folder', GalleryFolder);
diff --git a/javascript/indexdb.js b/javascript/indexdb.js
index 1998597d8..1115137a4 100644
--- a/javascript/indexdb.js
+++ b/javascript/indexdb.js
@@ -208,6 +208,16 @@ async function idbFolderCleanup(keepSet, folder, signal) {
   });
 }
 
+async function idbClearAll(signal) {
+  if (!db) return null;
+  return new Promise((resolve, reject) => {
+    const transaction = db.transaction(['thumbs'], 'readwrite');
+    const props = { transaction, signal, resolve, reject };
+    configureTransactionAbort(props, null);
+    transaction.objectStore('thumbs').clear();
+  });
+}
+
 window.idbAdd = add;
 window.idbDel = del;
 window.idbGet = get;