diff --git a/apps/mobile/packages/features/client/home/lib/src/data/repositories_impl/home_repository_impl.dart b/apps/mobile/packages/features/client/home/lib/src/data/repositories_impl/home_repository_impl.dart
index 9d594a93..11f15feb 100644
--- a/apps/mobile/packages/features/client/home/lib/src/data/repositories_impl/home_repository_impl.dart
+++ b/apps/mobile/packages/features/client/home/lib/src/data/repositories_impl/home_repository_impl.dart
@@ -1,4 +1,4 @@
-import 'package:firebase_data_connect/firebase_data_connect.dart';
+import 'package:firebase_data_connect/firebase_data_connect.dart';
 import 'package:krow_data_connect/krow_data_connect.dart' as dc;
 import 'package:krow_domain/krow_domain.dart';
 import '../../domain/repositories/home_repository_interface.dart';
diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/one_time_order_page.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/one_time_order_page.dart
index 56305271..cbd5bb2e 100644
--- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/one_time_order_page.dart
+++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/one_time_order_page.dart
@@ -70,7 +70,7 @@ class OneTimeOrderPage extends StatelessWidget {
                 bloc.add(OneTimeOrderPositionRemoved(index)),
             onSubmit: () => bloc.add(const OneTimeOrderSubmitted()),
             onDone: () => Modular.to.toOrdersSpecificDate(state.date),
-            onBack: () => Modular.to.toCreateOrder(),
+            onBack: () => Modular.to.pop(),
           );
         },
       ),
diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/permanent_order_page.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/permanent_order_page.dart
index 53f72eec..1b219108 100644
--- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/permanent_order_page.dart
+++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/permanent_order_page.dart
@@ -77,7 +77,7 @@ class PermanentOrderPage extends StatelessWidget {
               // Navigate to orders page with the initial date set to the first recurring shift date
               Modular.to.toOrdersSpecificDate(initialDate);
             },
-            onBack: () => Modular.to.toCreateOrder(),
+            onBack: () => Modular.to.pop(),
           );
         },
       ),
diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/recurring_order_page.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/recurring_order_page.dart
index ded17c96..c731f63b 100644
--- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/recurring_order_page.dart
+++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/recurring_order_page.dart
@@ -88,7 +88,7 @@ class RecurringOrderPage extends StatelessWidget {
               // Navigate to orders page with the initial date set to the first recurring shift date
               Modular.to.toOrdersSpecificDate(initialDate);
             },
-            onBack: () => Modular.to.toCreateOrder(),
+            onBack: () => Modular.to.pop(),
           );
         },
       ),