diff --git a/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx b/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx
index f259cb9d0..fcdcbed03 100644
--- a/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx
+++ b/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx
@@ -9,7 +9,7 @@ import React from "react";
 import { useIntl } from "react-intl";
 
 import { customerUrl } from "../../../../customers/urls";
-import { getStringOrPlaceholder, maybe } from "../../../../misc";
+import { getStringOrPlaceholder } from "../../../../misc";
 import { productUrl } from "../../../../products/urls";
 import OrderDraftCancelDialog from "../../../components/OrderDraftCancelDialog/OrderDraftCancelDialog";
 import OrderDraftPage from "../../../components/OrderDraftPage";
@@ -98,11 +98,8 @@ export const OrderDraftDetails: React.FC<OrderDraftDetailsProps> = ({
                 order: id
               })
             }
-            users={maybe(
-              () => users.data.search.edges.map(edge => edge.node),
-              []
-            )}
-            hasMore={maybe(() => users.data.search.pageInfo.hasNextPage, false)}
+            users={users?.data?.search?.edges?.map(edge => edge.node) || []}
+            hasMore={users?.data?.search?.pageInfo?.hasNextPage || false}
             onFetchMore={loadMoreCustomers}
             fetchUsers={searchUsers}
             loading={users.loading}
@@ -118,7 +115,7 @@ export const OrderDraftDetails: React.FC<OrderDraftDetailsProps> = ({
             onOrderLineAdd={() => openModal("add-order-line")}
             onBack={() => navigate(orderDraftListUrl())}
             order={order}
-            countries={maybe(() => data.shop.countries, []).map(country => ({
+            countries={(data?.shop?.countries || []).map(country => ({
               code: country.code,
               label: country.country
             }))}
diff --git a/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx b/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx
index c70f1bcb7..cc3565982 100644
--- a/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx
+++ b/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx
@@ -8,11 +8,7 @@ import React from "react";
 import { useIntl } from "react-intl";
 
 import { customerUrl } from "../../../../customers/urls";
-import {
-  getMutationState,
-  getStringOrPlaceholder,
-  maybe
-} from "../../../../misc";
+import { getMutationState, getStringOrPlaceholder } from "../../../../misc";
 import { productUrl } from "../../../../products/urls";
 import { FulfillmentStatus } from "../../../../types/globalTypes";
 import OrderCancelDialog from "../../../components/OrderCancelDialog";
@@ -123,7 +119,7 @@ export const OrderNormalDetails: React.FC<OrderNormalDetailsProps> = ({
               [])
           ]
         )}
-        shippingMethods={maybe(() => data.order.availableShippingMethods, [])}
+        shippingMethods={data?.order?.availableShippingMethods || []}
         userPermissions={user?.userPermissions || []}
         onOrderCancel={() => openModal("cancel")}
         onOrderFulfill={() => navigate(orderFulfillUrl(id))}
diff --git a/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx b/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx
index d5b7b5bd6..3f9088d36 100644
--- a/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx
+++ b/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx
@@ -11,11 +11,7 @@ import React from "react";
 import { useIntl } from "react-intl";
 
 import { customerUrl } from "../../../../customers/urls";
-import {
-  getMutationState,
-  getStringOrPlaceholder,
-  maybe
-} from "../../../../misc";
+import { getMutationState, getStringOrPlaceholder } from "../../../../misc";
 import { productUrl } from "../../../../products/urls";
 import { FulfillmentStatus } from "../../../../types/globalTypes";
 import OrderCancelDialog from "../../../components/OrderCancelDialog";
@@ -155,10 +151,7 @@ export const OrderUnconfirmedDetails: React.FC<OrderUnconfirmedDetailsProps> = (
                   .errors || [])
               ]
             )}
-            shippingMethods={maybe(
-              () => data.order.availableShippingMethods,
-              []
-            )}
+            shippingMethods={data?.order?.availableShippingMethods || []}
             userPermissions={user?.userPermissions || []}
             onOrderCancel={() => openModal("cancel")}
             onOrderFulfill={() => navigate(orderFulfillUrl(id))}
diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index 6eafa88ef..59a783120 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -127955,7 +127955,9 @@ exports[`Storyshots Views / Orders / Order list default 1`] = `
           <thead
             class="MuiTableHead-root-id"
           >
-            <tr>
+            <tr
+              class="MuiTableRow-root-id MuiTableRow-head-id"
+            >
               <th
                 class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderList-colNumber-id"
                 scope="col"
@@ -129324,7 +129326,9 @@ exports[`Storyshots Views / Orders / Order list loading 1`] = `
           <thead
             class="MuiTableHead-root-id"
           >
-            <tr>
+            <tr
+              class="MuiTableRow-root-id MuiTableRow-head-id"
+            >
               <th
                 class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderList-colNumber-id"
                 scope="col"
@@ -129762,7 +129766,9 @@ exports[`Storyshots Views / Orders / Order list when no data 1`] = `
           <thead
             class="MuiTableHead-root-id"
           >
-            <tr>
+            <tr
+              class="MuiTableRow-root-id MuiTableRow-head-id"
+            >
               <th
                 class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderList-colNumber-id"
                 scope="col"