diff --git a/server/src/services/app_import_export.service.ts b/server/src/services/app_import_export.service.ts
index fa49ba7387..9afc44ac7b 100644
--- a/server/src/services/app_import_export.service.ts
+++ b/server/src/services/app_import_export.service.ts
@@ -1788,6 +1788,10 @@ export class AppImportExportService {
         eventDefinition.modal = oldComponentToNewComponentMapping[eventDefinition.modal];
       }
 
+      if (eventDefinition?.actionId == 'set-table-page' && oldComponentToNewComponentMapping[eventDefinition.table]) {
+        eventDefinition.table = oldComponentToNewComponentMapping[eventDefinition.table];
+      }
+
       event.event = eventDefinition;
 
       await manager.save(event);
diff --git a/server/src/services/apps.service.ts b/server/src/services/apps.service.ts
index cea7f8d20e..1478c17032 100644
--- a/server/src/services/apps.service.ts
+++ b/server/src/services/apps.service.ts
@@ -517,6 +517,9 @@ export class AppsService {
         eventDefinition.modal = oldComponentToNewComponentMapping[eventDefinition.modal];
       }
 
+      if (eventDefinition?.actionId === 'set-table-page') {
+        eventDefinition.table = oldComponentToNewComponentMapping[eventDefinition.table];
+      }
       event.event = eventDefinition;
 
       await manager.save(event);
diff --git a/server/src/services/page.service.ts b/server/src/services/page.service.ts
index d769c3bc36..f30837c286 100644
--- a/server/src/services/page.service.ts
+++ b/server/src/services/page.service.ts
@@ -129,6 +129,10 @@ export class PageService {
               eventDefinition.modal = componentsIdMap[eventDefinition.modal];
             }
 
+            if (eventDefinition?.actionId === 'set-table-page') {
+              eventDefinition.table = componentsIdMap[eventDefinition.table];
+            }
+
             event.event = eventDefinition;
 
             const clonedEvent = new EventHandler();