diff --git a/server/src/services/app_import_export.service.ts b/server/src/services/app_import_export.service.ts
index 4b7eb8524d..e304a26194 100644
--- a/server/src/services/app_import_export.service.ts
+++ b/server/src/services/app_import_export.service.ts
@@ -471,7 +471,8 @@ export class AppImportExportService {
         appVersionId,
         appResourceMappings.dataQueryMapping,
         appResourceMappings.componentsMapping,
-        appResourceMappings.pagesMapping
+        appResourceMappings.pagesMapping,
+        isNormalizedAppDefinitionSchema
       );
     }
 
@@ -1404,8 +1405,11 @@ export class AppImportExportService {
     versionId: string,
     oldDataQueryToNewMapping: Record<string, unknown>,
     oldComponentToNewComponentMapping: Record<string, unknown>,
-    oldPageToNewPageMapping: Record<string, unknown>
+    oldPageToNewPageMapping: Record<string, unknown>,
+    isNormalizedAppDefinitionSchema: boolean
   ) {
+    if (!isNormalizedAppDefinitionSchema) return;
+
     const allEvents = await manager.find(EventHandler, {
       where: { appVersionId: versionId },
     });