diff --git a/src/api/iframeFeatureEvent.api.js b/src/api/iframePostMessageEvent.api.js
similarity index 100%
rename from src/api/iframeFeatureEvent.api.js
rename to src/api/iframePostMessageEvent.api.js
diff --git a/src/modules/map/components/openlayers/OpenLayersMap.vue b/src/modules/map/components/openlayers/OpenLayersMap.vue
index f71aa0e15..69327233f 100644
--- a/src/modules/map/components/openlayers/OpenLayersMap.vue
+++ b/src/modules/map/components/openlayers/OpenLayersMap.vue
@@ -4,7 +4,6 @@ import { get as getProjection } from 'ol/proj'
 import { computed, onMounted, provide, ref } from 'vue'
 import { useStore } from 'vuex'
 
-import { sendMapReadyEventToParent } from '@/api/iframeFeatureEvent.api'
 import { IS_TESTING_WITH_CYPRESS } from '@/config/staging.config'
 import { useLayerZIndexCalculation } from '@/modules/map/components/common/z-index.composable'
 import OpenLayersLayerExtents from '@/modules/map/components/openlayers/debug/OpenLayersLayerExtents.vue'
@@ -57,7 +56,6 @@ map.once('rendercomplete', () => {
     store.dispatch('mapModuleReady', dispatcher)
     log.info('Openlayer map rendered')
 })
-map.once('loadend', sendMapReadyEventToParent)
 
 onMounted(() => {
     map.setTarget(mapElement.value)
diff --git a/src/modules/map/components/openlayers/OpenLayersVectorLayer.vue b/src/modules/map/components/openlayers/OpenLayersVectorLayer.vue
index a55ae9e7c..bfd9ae4d1 100644
--- a/src/modules/map/components/openlayers/OpenLayersVectorLayer.vue
+++ b/src/modules/map/components/openlayers/OpenLayersVectorLayer.vue
@@ -13,7 +13,6 @@ import { Source } from 'ol/source'
 import { computed, inject, toRefs, watch } from 'vue'
 import { useStore } from 'vuex'
 
-import { sendMapReadyEventToParent } from '@/api/iframeFeatureEvent.api'
 import GeoAdminVectorLayer from '@/api/layers/GeoAdminVectorLayer.class'
 import MapLibreLayer from '@/modules/map/components/openlayers/utils/ol-maplibre-layer/MapLibreLayer'
 import useAddLayerToMap from '@/modules/map/components/openlayers/utils/useAddLayerToMap.composable'
@@ -60,8 +59,6 @@ const layer = new MapLibreLayer({
         return zoom
     },
 })
-// for vector tile print POC, we provide another map ready event here
-layer.once('load', sendMapReadyEventToParent)
 
 const olMap = inject('olMap')
 useAddLayerToMap(layer, olMap, zIndex)
diff --git a/src/modules/menu/components/share/MenuShareEmbed.vue b/src/modules/menu/components/share/MenuShareEmbed.vue
index ff189bc6c..2d09e5874 100644
--- a/src/modules/menu/components/share/MenuShareEmbed.vue
+++ b/src/modules/menu/components/share/MenuShareEmbed.vue
@@ -14,7 +14,7 @@ import { useI18n } from 'vue-i18n'
 import { useRoute } from 'vue-router'
 import { useStore } from 'vuex'
 
-import { IFRAME_EVENTS } from '@/api/iframeFeatureEvent.api'
+import { IFRAME_EVENTS } from '@/api/iframePostMessageEvent.api'
 import MenuShareInputCopyButton from '@/modules/menu/components/share/MenuShareInputCopyButton.vue'
 import ModalWithBackdrop from '@/utils/components/ModalWithBackdrop.vue'
 import { useTippyTooltip } from '@/utils/composables/useTippyTooltip'
@@ -133,7 +133,7 @@ function togglePreviewModal() {
 
 function onPreviewChange(e) {
     if (e?.data?.type === IFRAME_EVENTS.CHANGE) {
-        // see iframeFeatureEvent.api.js -> sendChangeEventToParent
+        // see iframePostMessageEvent.api.js -> sendChangeEventToParent
         embedSource.value = e.data.payload.newUrl
     }
 }
diff --git a/src/store/modules/features.store.js b/src/store/modules/features.store.js
index 9234a8806..45f36b856 100644
--- a/src/store/modules/features.store.js
+++ b/src/store/modules/features.store.js
@@ -5,7 +5,7 @@ import { toRaw } from 'vue'
 import EditableFeature, { EditableFeatureTypes } from '@/api/features/EditableFeature.class'
 import getFeature, { identify, identifyOnGeomAdminLayer } from '@/api/features/features.api'
 import LayerFeature from '@/api/features/LayerFeature.class'
-import { sendFeatureInformationToIFrameParent } from '@/api/iframeFeatureEvent.api'
+import { sendFeatureInformationToIFrameParent } from '@/api/iframePostMessageEvent.api'
 import getProfile from '@/api/profile/profile.api'
 import {
     DEFAULT_FEATURE_COUNT_RECTANGLE_SELECTION,
diff --git a/src/store/plugins/app-readiness.plugin.js b/src/store/plugins/app-readiness.plugin.js
index b9c2999b0..9e56231e6 100644
--- a/src/store/plugins/app-readiness.plugin.js
+++ b/src/store/plugins/app-readiness.plugin.js
@@ -1,3 +1,4 @@
+import { sendMapReadyEventToParent } from '@/api/iframePostMessageEvent.api'
 import { ENVIRONMENT } from '@/config/staging.config'
 import log from '@/utils/logging'
 
@@ -38,6 +39,7 @@ const appReadinessPlugin = (store) => {
 
         if (mutation.type === 'mapModuleReady') {
             store.dispatch('clearLoadingBar4MapLoading', { dispatcher })
+            sendMapReadyEventToParent()
         }
 
         // In production build we are not interested anymore in the mutation logs
diff --git a/src/views/EmbedView.vue b/src/views/EmbedView.vue
index d6042bdba..51c4fde90 100644
--- a/src/views/EmbedView.vue
+++ b/src/views/EmbedView.vue
@@ -3,7 +3,7 @@ import { computed, onBeforeMount, onMounted, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import { useStore } from 'vuex'
 
-import { sendChangeEventToParent } from '@/api/iframeFeatureEvent.api'
+import { sendChangeEventToParent } from '@/api/iframePostMessageEvent.api'
 import I18nModule from '@/modules/i18n/I18nModule.vue'
 import InfoboxModule from '@/modules/infobox/InfoboxModule.vue'
 import MapFooter from '@/modules/map/components/footer/MapFooter.vue'