diff --git a/server/src/services/app_import_export.service.ts b/server/src/services/app_import_export.service.ts
index eef2d1282a..f246e52321 100644
--- a/server/src/services/app_import_export.service.ts
+++ b/server/src/services/app_import_export.service.ts
@@ -792,7 +792,12 @@ export class AppImportExportService {
             await manager.save(EventHandler, newEvent);
           });
         } else {
+          this.replaceDataQueryOptionsWithNewDataQueryIds(
+            mappedNewDataQuery.options,
+            appResourceMappings.dataQueryMapping
+          );
           const queryEvents = mappedNewDataQuery.options?.events || [];
+
           delete mappedNewDataQuery?.options?.events;
 
           queryEvents.forEach(async (event, index) => {