diff --git a/BlueMapCommon/webapp/src/App.vue b/BlueMapCommon/webapp/src/App.vue
index 6d203776..7f8aa6f7 100644
--- a/BlueMapCommon/webapp/src/App.vue
+++ b/BlueMapCommon/webapp/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app" :class="{'theme-light': appState.theme === 'light', 'theme-dark': appState.theme === 'dark', 'theme-contrast': appState.theme === 'contrast'}">
-    <FreeFlightMobileControls v-if="mapViewer.mapLoaded && appState.controls.state === 'free'" />
+    <FreeFlightMobileControls v-if="mapViewer.mapState === 'loaded' && appState.controls.state === 'free'" />
     <ZoomButtons v-if="showMapMenu && appState.controls.showZoomButtons && appState.controls.state !== 'free'" />
     <ControlBar />
     <div v-if="mapViewer.mapState !== 'loaded'" class="map-state-message">{{ $t("map." + mapViewer.mapState) }}</div>