diff --git a/frontend/src/Editor/EditorFunc.jsx b/frontend/src/Editor/EditorFunc.jsx
index a933e34b8c..4d04688d83 100644
--- a/frontend/src/Editor/EditorFunc.jsx
+++ b/frontend/src/Editor/EditorFunc.jsx
@@ -687,9 +687,7 @@ const EditorComponent = (props) => {
     await fetchDataQueries(data.editing_version?.id, true, true);
     const currentPageEvents = data.events.filter((event) => event.target === 'page' && event.sourceId === homePageId);
 
-    for (const currentEvent of currentPageEvents ?? []) {
-      await handleEvent(currentEvent.name, currentPageEvents);
-    }
+    await handleEvent('onPageLoad', currentPageEvents);
   };
 
   //****** */
@@ -1295,11 +1293,7 @@ const EditorComponent = (props) => {
 
     const currentPageEvents = events.filter((event) => event.target === 'page' && event.sourceId === page.id);
 
-    (async () => {
-      for (const currentEvent of currentPageEvents ?? []) {
-        await handleEvent(currentEvent.name, currentPageEvents);
-      }
-    })();
+    handleEvent('onPageLoad', currentPageEvents);
   };
 
   const deletePageRequest = (pageId, isHomePage = false, pageName = '') => {
diff --git a/frontend/src/Editor/Viewer.jsx b/frontend/src/Editor/Viewer.jsx
index c8b4625356..227a5079d3 100644
--- a/frontend/src/Editor/Viewer.jsx
+++ b/frontend/src/Editor/Viewer.jsx
@@ -217,9 +217,7 @@ class ViewerComponent extends React.Component {
             (event) => event.target === 'page' && event.sourceId === this.state.currentPageId
           );
 
-          for (const currentEvent of currentPageEvents ?? []) {
-            await this.handleEvent(currentEvent.name, currentPageEvents);
-          }
+          await this.handleEvent('onPageLoad', currentPageEvents);
         });
       }
     );
@@ -491,9 +489,7 @@ class ViewerComponent extends React.Component {
               (event) => event.target === 'page' && event.sourceId === this.state.currentPageId
             );
 
-            for (const currentEvent of currentPageEvents ?? []) {
-              await this.handleEvent(currentEvent.name, currentPageEvents);
-            }
+            await this.handleEvent('onPageLoad', currentPageEvents);
           });
         }
       );