diff --git a/index.html b/index.html
index d73b3ff7..f69c971c 100644
--- a/index.html
+++ b/index.html
@@ -8232,7 +8232,7 @@
     <script src="modules/ui/style-presets.js?v=1.100.00"></script>
     <script src="modules/ui/general.js?v=1.100.00"></script>
     <script src="modules/ui/options.js?v=1.106.2"></script>
-    <script src="main.js?v=1.108.12">
+    <script src="main.js?v=1.108.13.1">
 
     <script defer src="modules/ui/style.js?v=1.108.4"></script>
     <script defer src="modules/ui/editors.js?v=1.108.5"></script>
@@ -8277,7 +8277,7 @@
     <script defer src="modules/coa-renderer.js?v=1.99.00"></script>
     <script defer src="libs/rgbquant.min.js"></script>
     <script defer src="libs/jquery.ui.touch-punch.min.js"></script>
-    <script defer src="modules/io/save.js?v=1.108.12"></script>
+    <script defer src="modules/io/save.js?v=1.108.13.1"></script>
     <script defer src="modules/io/load.js?v=1.108.13"></script>
     <script defer src="modules/io/cloud.js?v=1.106.0"></script>
     <script defer src="modules/io/export.js?v=1.108.11"></script>
diff --git a/main.js b/main.js
index 4f4bdb63..5d67e029 100644
--- a/main.js
+++ b/main.js
@@ -291,6 +291,14 @@ async function checkLoadParameters() {
     return;
   }
 
+  // restore onloadBehavior from localStorage if saved
+  const storedBehavior = localStorage.getItem("onloadBehavior");
+  WARN && console.warn("Stored onloadBehavior:", storedBehavior);
+  if (storedBehavior) {
+    byId("onloadBehavior").value = storedBehavior;
+  }
+  WARN && console.warn("Current onloadBehavior value:", byId("onloadBehavior").value);
+
   // check if there is a default map saved to indexedDB
   if (byId("onloadBehavior").value === "default") {
     try {
diff --git a/modules/io/save.js b/modules/io/save.js
index 7a9236c7..5232bcf7 100644
--- a/modules/io/save.js
+++ b/modules/io/save.js
@@ -175,6 +175,9 @@ async function saveAsDefaultMap() {
     const mapData = prepareMapData();
     const blob = new Blob([mapData], {type: "text/plain"});
     await ldb.set("defaultMap", blob);
+    localStorage.setItem("onloadBehavior", "default");
+    byId("onloadBehavior").value = "default";
+    WARN && console.warn("Default map saved. onloadBehavior set to:", localStorage.getItem("onloadBehavior"));
     tip("Map is set as default and will open on load", true, "success", 5000);
   } catch (error) {
     ERROR && console.error(error);
@@ -186,6 +189,8 @@ async function saveAsDefaultMap() {
 async function clearDefaultMap() {
   try {
     await ldb.set("defaultMap", null);
+    localStorage.removeItem("onloadBehavior");
+    byId("onloadBehavior").value = "random";
     tip("Default map cleared", false, "success", 2000);
   } catch (error) {
     ERROR && console.error(error);