diff --git a/server/src/services/app_import_export.service.ts b/server/src/services/app_import_export.service.ts
index a7127c6327..ee6dfab711 100644
--- a/server/src/services/app_import_export.service.ts
+++ b/server/src/services/app_import_export.service.ts
@@ -579,10 +579,8 @@ export class AppImportExportService {
           name: event.eventId,
           sourceId: newQuery.id,
           target: Target.dataQuery,
-          event: {
-            ...event,
-            eventIndex: index,
-          },
+          event: event,
+          index: queryEvents.index || index,
           appVersionId: newQuery.appVersionId,
         };
 
@@ -655,10 +653,8 @@ export class AppImportExportService {
                 name: event.eventId,
                 sourceId: pageCreated.id,
                 target: Target.page,
-                event: {
-                  ...event,
-                  eventIndex: index,
-                },
+                event: event,
+                index: pageEvents.index || index,
                 appVersionId: appVersionMapping[appVersion.id],
               };
 
@@ -674,10 +670,8 @@ export class AppImportExportService {
                 name: event.eventId,
                 sourceId: eventObj.componentId,
                 target: Target.component,
-                event: {
-                  ...event,
-                  eventIndex: index,
-                },
+                event: event,
+                index: eventObj.index || index,
                 appVersionId: appVersionMapping[appVersion.id],
               };