diff --git a/frontend/react/src/map/drawings/drawingsmanager.ts b/frontend/react/src/map/drawings/drawingsmanager.ts
index af74ffce..7c823bfa 100644
--- a/frontend/react/src/map/drawings/drawingsmanager.ts
+++ b/frontend/react/src/map/drawings/drawingsmanager.ts
@@ -719,6 +719,7 @@ export class DrawingsManager {
     SessionDataLoadedEvent.on((sessionData) => {
       this.#sessionDataDrawings = sessionData.drawings ?? {};
       if (this.#initialized) if (this.#sessionDataDrawings["Mission drawings"]) this.#drawingsContainer.fromJSON(this.#sessionDataDrawings["Mission drawings"]);
+      this.#drawingsContainer.setVisibility(getApp().getMap().getOptions().showMissionDrawings);
     });
   }
 
@@ -727,6 +728,7 @@ export class DrawingsManager {
       this.#drawingsContainer.initFromData(data.drawings);
       if (data.drawings.navpoints) this.#drawingsContainer.initNavpoints(data.drawings.navpoints);
       if (this.#sessionDataDrawings["Mission drawings"]) this.#drawingsContainer.fromJSON(this.#sessionDataDrawings["Mission drawings"]);
+      this.#drawingsContainer.setVisibility(getApp().getMap().getOptions().showMissionDrawings);
       DrawingsInitEvent.dispatch(this.#drawingsContainer);
       this.#initialized = true;
       return true;
diff --git a/frontend/react/src/ui/panels/drawingmenu.tsx b/frontend/react/src/ui/panels/drawingmenu.tsx
index 56e1737a..a410cded 100644
--- a/frontend/react/src/ui/panels/drawingmenu.tsx
+++ b/frontend/react/src/ui/panels/drawingmenu.tsx
@@ -92,7 +92,12 @@ export function DrawingMenu(props: { open: boolean; onClose: () => void }) {
                   hover:scale-125 hover:text-gray-200
                 `}
                 onClick={() => {
-                  container.setVisibility(!container.getVisibility(), true);
+                  
+                  if (container === mainDrawingsContainer.container) {
+                    getApp().getMap().setOption("showMissionDrawings", !getApp().getMap().getOptions().showMissionDrawings);
+                  } else {
+                    container.setVisibility(!container.getVisibility(), true);
+                  }
                 }}
               />
               <div
diff --git a/frontend/react/src/ui/panels/header.tsx b/frontend/react/src/ui/panels/header.tsx
index 16259944..120971c6 100644
--- a/frontend/react/src/ui/panels/header.tsx
+++ b/frontend/react/src/ui/panels/header.tsx
@@ -66,7 +66,9 @@ export function Header() {
 
   useEffect(() => {
     HiddenTypesChangedEvent.on((hiddenTypes) => setMapHiddenTypes({ ...hiddenTypes }));
-    MapOptionsChangedEvent.on((mapOptions) => setMapOptions({ ...mapOptions }));
+    MapOptionsChangedEvent.on((mapOptions) => {
+      setMapOptions({ ...mapOptions })
+  });
     MapSourceChangedEvent.on((source) => setMapSource(source));
     ConfigLoadedEvent.on((config: OlympusConfig) => {
       // Timeout needed to make sure the map configuration has updated