diff --git a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
index 35618fa3b..01e5ded57 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
@@ -122,42 +122,45 @@ const InfoRow = ({ label, value }: { label: string; value: string }) => (
   </Stack>
 );
 
-const BookingInfo = ({ record }: { record: FirstMileRecord }) => (
-  <Card radius="md" padding="md" withBorder bg="var(--mantine-color-gray-0)">
-    <Stack gap="sm">
-      <Group justify="space-between">
-        <Text fw={600}>{bookingRef(record)}</Text>
-        <Group gap="xs">
-          <Badge color={STATUS_META[record.status].color} variant="light" size="sm">
-            {STATUS_META[record.status].label}
-          </Badge>
-          <Badge
-            color={isAssigned(record) ? "green" : "orange"}
-            variant="light"
-            size="sm"
-          >
-            {isAssigned(record) ? "Assigned" : "Unassigned"}
-          </Badge>
+const BookingInfo = ({ record }: { record: FirstMileRecord }) => {
+  const hasPickupAddress = record.booking?.firstMilePickupAddress != null;
+  return (
+    <Card radius="md" padding="md" withBorder bg="var(--mantine-color-gray-0)">
+      <Stack gap="sm">
+        <Group justify="space-between">
+          <Text fw={600}>{bookingRef(record)}</Text>
+          <Group gap="xs">
+            <Badge color={STATUS_META[record.status].color} variant="light" size="sm">
+              {STATUS_META[record.status].label}
+            </Badge>
+            <Badge
+              color={isAssigned(record) ? "green" : "orange"}
+              variant="light"
+              size="sm"
+            >
+              {isAssigned(record) ? "Assigned" : "Unassigned"}
+            </Badge>
+          </Group>
         </Group>
-      </Group>
-      <SimpleGrid cols={2} spacing="sm">
-        <InfoRow label="Customer" value={customerName(record)} />
-        <InfoRow label="Service type" value={serviceTypeName(record)} />
-        <InfoRow label="Pickup location" value={pickupLocation(record)} />
-        <InfoRow label="Destination (origin yard)" value={destinationYardName(record)} />
-        <InfoRow label="Cargo" value={cargoDesc(record)} />
-        <InfoRow label="Advanced Payment" value={formatPrice(record.advancedPayment)} />
-        <InfoRow label="Post Payment" value={formatPrice(record.remainingPayment)} />
-        <InfoRow label="Contact" value={contactPersonName(record)} />
-        <InfoRow label="Phone" value={contactPhone(record)} />
-        <InfoRow label="Requested date" value={requestedDate(record)} />
-        <InfoRow label="Assigned vehicle" value={vehicleLabel(record) ?? "—"} />
-        <InfoRow label="Est. Distance (KM)" value={record.estimatedKm != null ? String(record.estimatedKm) : "—"} />
-        <InfoRow label="Actual Distance (KM)" value={record.exactKm != null ? String(record.exactKm) : "—"} />
-      </SimpleGrid>
-    </Stack>
-  </Card>
-);
+        <SimpleGrid cols={2} spacing="sm">
+          <InfoRow label="Customer" value={customerName(record)} />
+          <InfoRow label="Service type" value={serviceTypeName(record)} />
+          {hasPickupAddress && <InfoRow label="Pickup location" value={pickupLocation(record)} />}
+          <InfoRow label="Destination (origin yard)" value={destinationYardName(record)} />
+          <InfoRow label="Cargo" value={cargoDesc(record)} />
+          <InfoRow label="Advanced Payment" value={formatPrice(record.advancedPayment)} />
+          <InfoRow label="Post Payment" value={formatPrice(record.remainingPayment)} />
+          <InfoRow label="Contact" value={contactPersonName(record)} />
+          <InfoRow label="Phone" value={contactPhone(record)} />
+          <InfoRow label="Requested date" value={requestedDate(record)} />
+          <InfoRow label="Assigned vehicle" value={vehicleLabel(record) ?? "—"} />
+          <InfoRow label="Est. Distance (KM)" value={record.estimatedKm != null ? String(record.estimatedKm) : "—"} />
+          <InfoRow label="Actual Distance (KM)" value={record.exactKm != null ? String(record.exactKm) : "—"} />
+        </SimpleGrid>
+      </Stack>
+    </Card>
+  );
+};
 
 const tripSlipRows = (record: FirstMileRecord): [string, string][] => [
   ["Customer", customerName(record)],
diff --git a/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx b/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
index 70d9e9105..e85fbfd2d 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
@@ -117,38 +117,41 @@ const InfoRow = ({ label, value }: { label: string; value: string }) => (
   </Stack>
 );
 
-const BookingInfo = ({ record }: { record: LastMileRecord }) => (
-  <Card radius="md" padding="md" withBorder bg="var(--mantine-color-gray-0)">
-    <Stack gap="sm">
-      <Group justify="space-between">
-        <Text fw={600}>{bookingRef(record)}</Text>
-        <Group gap="xs">
-          <Badge color={STATUS_META[record.status].color} variant="light" size="sm">
-            {STATUS_META[record.status].label}
-          </Badge>
-          <Badge color={isAssigned(record) ? "green" : "orange"} variant="light" size="sm">
-            {isAssigned(record) ? "Assigned" : "Unassigned"}
-          </Badge>
+const BookingInfo = ({ record }: { record: LastMileRecord }) => {
+  const hasDeliveryAddress = record.booking?.lastMileDeliveryAddress != null;
+  return (
+    <Card radius="md" padding="md" withBorder bg="var(--mantine-color-gray-0)">
+      <Stack gap="sm">
+        <Group justify="space-between">
+          <Text fw={600}>{bookingRef(record)}</Text>
+          <Group gap="xs">
+            <Badge color={STATUS_META[record.status].color} variant="light" size="sm">
+              {STATUS_META[record.status].label}
+            </Badge>
+            <Badge color={isAssigned(record) ? "green" : "orange"} variant="light" size="sm">
+              {isAssigned(record) ? "Assigned" : "Unassigned"}
+            </Badge>
+          </Group>
         </Group>
-      </Group>
-      <SimpleGrid cols={2} spacing="sm">
-        <InfoRow label="Customer" value={customerName(record)} />
-        <InfoRow label="Service type" value={serviceTypeName(record)} />
-        <InfoRow label="Pickup (origin yard)" value={originYardName(record)} />
-        <InfoRow label="Destination" value={deliveryLocation(record)} />
-        <InfoRow label="Cargo" value={cargoDesc(record)} />
-        <InfoRow label="Advanced Payment" value={formatPrice(record.advancedPayment)} />
-        <InfoRow label="Post Payment" value={formatPrice(record.remainingPayment)} />
-        <InfoRow label="Contact" value={contactPersonName(record)} />
-        <InfoRow label="Phone" value={contactPhone(record)} />
-        <InfoRow label="Requested date" value={requestedDate(record)} />
-        <InfoRow label="Assigned vehicle" value={vehicleLabel(record) ?? "—"} />
-        <InfoRow label="Est. Distance (KM)" value={record.estimatedKm != null ? String(record.estimatedKm) : "—"} />
-        <InfoRow label="Actual Distance (KM)" value={record.exactKm != null ? String(record.exactKm) : "—"} />
-      </SimpleGrid>
-    </Stack>
-  </Card>
-);
+        <SimpleGrid cols={2} spacing="sm">
+          <InfoRow label="Customer" value={customerName(record)} />
+          <InfoRow label="Service type" value={serviceTypeName(record)} />
+          <InfoRow label="Pickup (origin yard)" value={originYardName(record)} />
+          {hasDeliveryAddress && <InfoRow label="Destination" value={deliveryLocation(record)} />}
+          <InfoRow label="Cargo" value={cargoDesc(record)} />
+          <InfoRow label="Advanced Payment" value={formatPrice(record.advancedPayment)} />
+          <InfoRow label="Post Payment" value={formatPrice(record.remainingPayment)} />
+          <InfoRow label="Contact" value={contactPersonName(record)} />
+          <InfoRow label="Phone" value={contactPhone(record)} />
+          <InfoRow label="Requested date" value={requestedDate(record)} />
+          <InfoRow label="Assigned vehicle" value={vehicleLabel(record) ?? "—"} />
+          <InfoRow label="Est. Distance (KM)" value={record.estimatedKm != null ? String(record.estimatedKm) : "—"} />
+          <InfoRow label="Actual Distance (KM)" value={record.exactKm != null ? String(record.exactKm) : "—"} />
+        </SimpleGrid>
+      </Stack>
+    </Card>
+  );
+};
 
 const tripSlipRows = (record: LastMileRecord): [string, string][] => [
   ["Customer", customerName(record)],