diff --git a/src/static/dashboard.html b/src/static/dashboard.html
index a2bdbff..5e56ae5 100644
--- a/src/static/dashboard.html
+++ b/src/static/dashboard.html
@@ -408,7 +408,7 @@
                                     <span class="map-stats" id="map-stats"></span>
                                     <div class="card-header-actions">
                                         <label class="geoint-toggle" title="GEOINT-Modus aktivieren">
-                                            <input type="checkbox" id="geoint-mode-cb" onchange="GEOINT.toggle(this.checked, UI._map)">
+                                            <input type="checkbox" id="geoint-mode-cb" onchange="GEOINT.toggle(this.checked, UI._map || GEOINT._map)">
                                             <span class="geoint-toggle-label">GEOINT</span>
                                         </label>
                                         <button class="btn btn-secondary btn-small" id="geoparse-btn" onclick="App.triggerGeoparse()" title="Orte aus Artikeln einlesen">Orte einlesen</button>
@@ -805,7 +805,7 @@
             <div class="map-fullscreen-title">Geografische Verteilung</div>
             <span class="map-stats map-fullscreen-stats" id="map-fullscreen-stats"></span>
             <label class="geoint-toggle" title="GEOINT-Modus">
-                <input type="checkbox" id="geoint-mode-cb-fs" onchange="GEOINT.toggle(this.checked, UI._map)">
+                <input type="checkbox" id="geoint-mode-cb-fs" onchange="GEOINT.toggle(this.checked, UI._map || GEOINT._map)">
                 <span class="geoint-toggle-label">GEOINT</span>
             </label>
             <button class="btn btn-secondary btn-small" onclick="UI.toggleMapFullscreen()" title="Vollbild beenden" aria-label="Vollbild beenden">
diff --git a/src/static/js/geoint.js b/src/static/js/geoint.js
index 54e717e..0f53200 100644
--- a/src/static/js/geoint.js
+++ b/src/static/js/geoint.js
@@ -35,6 +35,9 @@ const GEOINT = {
     // Hauptschalter
     // -----------------------------------------------------------------------
     toggle(enabled, map) {
+        if (!map) map = this._map;
+        if (!map && typeof UI !== 'undefined') map = UI._map;
+        if (!map) { console.warn('GEOINT: keine Karte verfuegbar'); return; }
         this._active = enabled;
         this._map = map;