diff --git a/www/assets/js/map.js b/www/assets/js/map.js
index be415d9..b512373 100644
--- a/www/assets/js/map.js
+++ b/www/assets/js/map.js
@@ -16,12 +16,16 @@ function createMap() {
  * @returns {undefined}
  */
 function reloadMap() {
-    if (map != null) {
-        map.off();
-        map.remove();
-        map = null;
+    try {
+        if (map != null && typeof map != 'undefined') {
+            map.off();
+            map.remove();
+            map = null;
+        }
+        createMap();
+    } catch (ex) {
+        // oh well ¯\(°_o)/¯
     }
-    createMap();
 }
 
 /**
diff --git a/www/assets/js/settings.js b/www/assets/js/settings.js
index 9debfc5..40cb333 100644
--- a/www/assets/js/settings.js
+++ b/www/assets/js/settings.js
@@ -145,7 +145,8 @@ function pickMapSource() {
                     return;
             }
             localStorage.setItem("mapsource", mapsource);
-
+            // Re-init map to load new style
+            reloadMap();
         }
     }).open();
 }