diff --git a/screensaver.js b/screensaver.js
index 327710f..8fb5296 100644
--- a/screensaver.js
+++ b/screensaver.js
@@ -106,12 +106,21 @@ document.addEventListener("DOMContentLoaded", () => {
         }
     }
 
-    function loadImageHistory() {
-        imageHistory = [];
-        promptHistory = [];
-        updateThumbnailHistory();
-        console.log("Cleared imageHistory and promptHistory on startup.");
-    }
+    function loadImageHistory() {
+        try {
+            const rawImages = localStorage.getItem("imageHistory");
+            const rawPrompts = localStorage.getItem("promptHistory");
+            imageHistory = rawImages ? JSON.parse(rawImages) : [];
+            promptHistory = rawPrompts ? JSON.parse(rawPrompts) : [];
+            console.log("Loaded imageHistory from localStorage:", imageHistory);
+            console.log("Loaded promptHistory from localStorage:", promptHistory);
+        } catch (err) {
+            console.warn("Failed to load image history from localStorage:", err);
+            imageHistory = [];
+            promptHistory = [];
+        }
+        updateThumbnailHistory();
+    }
 
     loadScreensaverSettings();
     loadImageHistory();
@@ -457,11 +466,7 @@ document.addEventListener("DOMContentLoaded", () => {
         clearInterval(promptInterval);
         promptInterval = null;
 
-        imageHistory = [];
-        promptHistory = [];
-        localStorage.removeItem("imageHistory");
-        localStorage.removeItem("promptHistory");
-        updateThumbnailHistory();
+        saveImageHistory();
 
         document.body.style.overflow = "";
         window.screensaverActive = false;