diff --git a/apps/mobile/packages/features/client/create_order/lib/src/data/repositories_impl/client_create_order_repository_impl.dart b/apps/mobile/packages/features/client/create_order/lib/src/data/repositories_impl/client_create_order_repository_impl.dart
index f08038cc..9c952c6e 100644
--- a/apps/mobile/packages/features/client/create_order/lib/src/data/repositories_impl/client_create_order_repository_impl.dart
+++ b/apps/mobile/packages/features/client/create_order/lib/src/data/repositories_impl/client_create_order_repository_impl.dart
@@ -147,7 +147,7 @@ class ClientCreateOrderRepositoryImpl
     }
 
     await _dataConnect
-        .updateOrder(id: orderId)
+        .updateOrder(id: orderId, teamHubId: hub.id)
         .shifts(fdc.AnyValue(<String>[shiftId]))
         .execute();
   }
diff --git a/apps/mobile/packages/features/client/home/lib/src/presentation/widgets/shift_order_form_sheet.dart b/apps/mobile/packages/features/client/home/lib/src/presentation/widgets/shift_order_form_sheet.dart
index 666a4971..603594b8 100644
--- a/apps/mobile/packages/features/client/home/lib/src/presentation/widgets/shift_order_form_sheet.dart
+++ b/apps/mobile/packages/features/client/home/lib/src/presentation/widgets/shift_order_form_sheet.dart
@@ -284,7 +284,7 @@ class _ShiftOrderFormSheetState extends State<ShiftOrderFormSheet> {
     }
 
     await _dataConnect
-        .updateOrder(id: orderId)
+        .updateOrder(id: orderId, teamHubId: selectedHub.id)
         .shifts(fdc.AnyValue(<String>[shiftId]))
         .execute();
 
diff --git a/apps/mobile/packages/features/client/view_orders/lib/src/presentation/widgets/view_order_card.dart b/apps/mobile/packages/features/client/view_orders/lib/src/presentation/widgets/view_order_card.dart
index 59521da3..d3dcb040 100644
--- a/apps/mobile/packages/features/client/view_orders/lib/src/presentation/widgets/view_order_card.dart
+++ b/apps/mobile/packages/features/client/view_orders/lib/src/presentation/widgets/view_order_card.dart
@@ -737,7 +737,7 @@ class _OrderEditSheetState extends State<_OrderEditSheet> {
       final String dateText = orderDate == null
           ? widget.order.date
           : DateFormat('yyyy-MM-dd').format(orderDate);
-      final String location = firstShift.order.location ??
+      final String location = firstShift.order.teamHub?.hubName ??
           firstShift.locationAddress ??
           firstShift.location ??
           widget.order.locationAddress;