diff --git a/bciers/apps/registration/app/bceidbusiness/industry_user/register-an-operation/[operation]/[step]/page.tsx b/bciers/apps/registration/app/bceidbusiness/industry_user/register-an-operation/[operation]/[step]/page.tsx
index aaf9c33ec2..371f37f35a 100644
--- a/bciers/apps/registration/app/bceidbusiness/industry_user/register-an-operation/[operation]/[step]/page.tsx
+++ b/bciers/apps/registration/app/bceidbusiness/industry_user/register-an-operation/[operation]/[step]/page.tsx
@@ -1,5 +1,6 @@
 import OperationRegistrationPage from "apps/registration/app/components/operations/OperationRegistrationPage";
-
+import { Suspense } from "react";
+import Loading from "@bciers/components/loading/SkeletonForm";
 import { UUID } from "crypto";
 
 export default function Page({
@@ -11,10 +12,12 @@ export default function Page({
 }) {
   const { operation, step } = params;
   return (
-    <OperationRegistrationPage
-      step={parseInt(step)}
-      operation={operation}
-      searchParams={searchParams}
-    />
+    <Suspense fallback={<Loading />}>
+      <OperationRegistrationPage
+        step={parseInt(step)}
+        operation={operation}
+        searchParams={searchParams}
+      />
+    </Suspense>
   );
 }
diff --git a/bciers/apps/registration/app/bceidbusiness/industry_user/register-an-operation/page.tsx b/bciers/apps/registration/app/bceidbusiness/industry_user/register-an-operation/page.tsx
index 5ae6075944..e852e17797 100644
--- a/bciers/apps/registration/app/bceidbusiness/industry_user/register-an-operation/page.tsx
+++ b/bciers/apps/registration/app/bceidbusiness/industry_user/register-an-operation/page.tsx
@@ -2,6 +2,8 @@
 
 import OperationRegistrationPage from "@/registration/app/components/operations/OperationRegistrationPage";
 import { UUID } from "crypto";
+import { Suspense } from "react";
+import Loading from "@bciers/components/loading/SkeletonForm";
 
 export default async function Page({
   params,
@@ -11,12 +13,12 @@ export default async function Page({
   searchParams: any;
 }) {
   return (
-    <>
+    <Suspense fallback={<Loading />}>
       <OperationRegistrationPage
         step={1}
         operation={params?.operation}
         searchParams={searchParams}
       />
-    </>
+    </Suspense>
   );
 }
diff --git a/bciers/apps/registration/app/bceidbusiness/industry_user_admin/register-an-operation/[operation]/[step]/page.tsx b/bciers/apps/registration/app/bceidbusiness/industry_user_admin/register-an-operation/[operation]/[step]/page.tsx
index aaf9c33ec2..371f37f35a 100644
--- a/bciers/apps/registration/app/bceidbusiness/industry_user_admin/register-an-operation/[operation]/[step]/page.tsx
+++ b/bciers/apps/registration/app/bceidbusiness/industry_user_admin/register-an-operation/[operation]/[step]/page.tsx
@@ -1,5 +1,6 @@
 import OperationRegistrationPage from "apps/registration/app/components/operations/OperationRegistrationPage";
-
+import { Suspense } from "react";
+import Loading from "@bciers/components/loading/SkeletonForm";
 import { UUID } from "crypto";
 
 export default function Page({
@@ -11,10 +12,12 @@ export default function Page({
 }) {
   const { operation, step } = params;
   return (
-    <OperationRegistrationPage
-      step={parseInt(step)}
-      operation={operation}
-      searchParams={searchParams}
-    />
+    <Suspense fallback={<Loading />}>
+      <OperationRegistrationPage
+        step={parseInt(step)}
+        operation={operation}
+        searchParams={searchParams}
+      />
+    </Suspense>
   );
 }
diff --git a/bciers/apps/registration/app/bceidbusiness/industry_user_admin/register-an-operation/page.tsx b/bciers/apps/registration/app/bceidbusiness/industry_user_admin/register-an-operation/page.tsx
index 5ae6075944..e852e17797 100644
--- a/bciers/apps/registration/app/bceidbusiness/industry_user_admin/register-an-operation/page.tsx
+++ b/bciers/apps/registration/app/bceidbusiness/industry_user_admin/register-an-operation/page.tsx
@@ -2,6 +2,8 @@
 
 import OperationRegistrationPage from "@/registration/app/components/operations/OperationRegistrationPage";
 import { UUID } from "crypto";
+import { Suspense } from "react";
+import Loading from "@bciers/components/loading/SkeletonForm";
 
 export default async function Page({
   params,
@@ -11,12 +13,12 @@ export default async function Page({
   searchParams: any;
 }) {
   return (
-    <>
+    <Suspense fallback={<Loading />}>
       <OperationRegistrationPage
         step={1}
         operation={params?.operation}
         searchParams={searchParams}
       />
-    </>
+    </Suspense>
   );
 }
diff --git a/bciers/apps/reporting/src/app/bceidbusiness/industry_user/reports/[version_id]/facilities/[facility_id]/review/page.tsx b/bciers/apps/reporting/src/app/bceidbusiness/industry_user/reports/[version_id]/facilities/[facility_id]/review/page.tsx
index 223c97e25d..7ade287a83 100644
--- a/bciers/apps/reporting/src/app/bceidbusiness/industry_user/reports/[version_id]/facilities/[facility_id]/review/page.tsx
+++ b/bciers/apps/reporting/src/app/bceidbusiness/industry_user/reports/[version_id]/facilities/[facility_id]/review/page.tsx
@@ -1,4 +1,6 @@
 import FacilityReviewFormData from "@reporting/src/app/components/facility/FacilityReviewFormData";
+import { Suspense } from "react";
+import Loading from "@bciers/components/loading/SkeletonForm";
 
 export default async function Page({
   params,
@@ -6,9 +8,11 @@ export default async function Page({
   params: { version_id: number; facility_id: number };
 }) {
   return (
-    <FacilityReviewFormData
-      version_id={params.version_id}
-      facility_id={params.facility_id}
-    />
+    <Suspense fallback={<Loading />}>
+      <FacilityReviewFormData
+        version_id={params.version_id}
+        facility_id={params.facility_id}
+      />
+    </Suspense>
   );
 }
diff --git a/bciers/apps/reporting/src/app/bceidbusiness/industry_user_admin/reports/[version_id]/facilities/[facility_id]/review/page.tsx b/bciers/apps/reporting/src/app/bceidbusiness/industry_user_admin/reports/[version_id]/facilities/[facility_id]/review/page.tsx
index 223c97e25d..7ade287a83 100644
--- a/bciers/apps/reporting/src/app/bceidbusiness/industry_user_admin/reports/[version_id]/facilities/[facility_id]/review/page.tsx
+++ b/bciers/apps/reporting/src/app/bceidbusiness/industry_user_admin/reports/[version_id]/facilities/[facility_id]/review/page.tsx
@@ -1,4 +1,6 @@
 import FacilityReviewFormData from "@reporting/src/app/components/facility/FacilityReviewFormData";
+import { Suspense } from "react";
+import Loading from "@bciers/components/loading/SkeletonForm";
 
 export default async function Page({
   params,
@@ -6,9 +8,11 @@ export default async function Page({
   params: { version_id: number; facility_id: number };
 }) {
   return (
-    <FacilityReviewFormData
-      version_id={params.version_id}
-      facility_id={params.facility_id}
-    />
+    <Suspense fallback={<Loading />}>
+      <FacilityReviewFormData
+        version_id={params.version_id}
+        facility_id={params.facility_id}
+      />
+    </Suspense>
   );
 }