diff --git a/packages/admin-next/dashboard/src/hooks/table/filters/use-customer-table-filters.tsx b/packages/admin-next/dashboard/src/hooks/table/filters/use-customer-table-filters.tsx
index e02fac6afe..bd06367ffd 100644
--- a/packages/admin-next/dashboard/src/hooks/table/filters/use-customer-table-filters.tsx
+++ b/packages/admin-next/dashboard/src/hooks/table/filters/use-customer-table-filters.tsx
@@ -14,7 +14,6 @@ export const useCustomerTableFilters = (
   const { customer_groups } = useCustomerGroups(
     {
       limit: 1000,
-      expand: "",
     },
     {
       enabled: !isGroupsExcluded,
diff --git a/packages/admin-next/dashboard/src/hooks/table/filters/use-order-table-filters.tsx b/packages/admin-next/dashboard/src/hooks/table/filters/use-order-table-filters.tsx
index d73059c55a..8eea8cd9fc 100644
--- a/packages/admin-next/dashboard/src/hooks/table/filters/use-order-table-filters.tsx
+++ b/packages/admin-next/dashboard/src/hooks/table/filters/use-order-table-filters.tsx
@@ -10,13 +10,11 @@ export const useOrderTableFilters = (): Filter[] => {
   const { regions } = useRegions({
     limit: 1000,
     fields: "id,name",
-    expand: "",
   })
 
   const { sales_channels } = useSalesChannels({
     limit: 1000,
     fields: "id,name",
-    expand: "",
   })
 
   let filters: Filter[] = []
diff --git a/packages/admin-next/dashboard/src/routes/customers/customer-detail/components/customer-order-section/customer-order-section.tsx b/packages/admin-next/dashboard/src/routes/customers/customer-detail/components/customer-order-section/customer-order-section.tsx
index 139e921928..2d6c198f4a 100644
--- a/packages/admin-next/dashboard/src/routes/customers/customer-detail/components/customer-order-section/customer-order-section.tsx
+++ b/packages/admin-next/dashboard/src/routes/customers/customer-detail/components/customer-order-section/customer-order-section.tsx
@@ -18,7 +18,7 @@ type CustomerGeneralSectionProps = {
 }
 
 const PAGE_SIZE = 10
-const DEFAULT_RELATIONS = "customer,items,sales_channel"
+const DEFAULT_RELATIONS = "*customer,*items,*sales_channel"
 const DEFAULT_FIELDS =
   "id,status,display_id,created_at,email,fulfillment_status,payment_status,total,currency_code"
 
@@ -33,8 +33,7 @@ export const CustomerOrderSection = ({
   const { orders, count, isLoading, isError, error } = useOrders(
     {
       customer_id: customer.id,
-      expand: DEFAULT_RELATIONS,
-      fields: DEFAULT_FIELDS,
+      fields: DEFAULT_FIELDS + "," + DEFAULT_RELATIONS,
       ...searchParams,
     },
     {
diff --git a/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-activity-section/order-timeline.tsx b/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-activity-section/order-timeline.tsx
index 011ca62664..456a9555c6 100644
--- a/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-activity-section/order-timeline.tsx
+++ b/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-activity-section/order-timeline.tsx
@@ -10,6 +10,7 @@ import { AdminOrder } from "@medusajs/types"
 import { useTranslation } from "react-i18next"
 import { Skeleton } from "../../../../../components/common/skeleton"
 import { useDate } from "../../../../../hooks/use-date"
+import { useStockLocation } from "../../../../../hooks/api/stock-locations"
 
 type OrderTimelineProps = {
   order: AdminOrder
@@ -365,8 +366,9 @@ const FulfillmentCreatedBody = ({
 }) => {
   const { t } = useTranslation()
 
-  const { stock_location, isLoading, isError, error } = useAdminStockLocation(
+  const { stock_location, isLoading, isError, error } = useStockLocation(
     fulfillment.location_id!,
+    undefined,
     {
       enabled: !!fulfillment.location_id,
     }
diff --git a/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx b/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx
index 88f14bfdeb..d7e6f3690a 100644
--- a/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx
+++ b/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx
@@ -167,6 +167,7 @@ const Fulfillment = ({
 
   const { stock_location, isError, error } = useStockLocation(
     fulfillment.location_id!,
+    undefined,
     {
       enabled: showLocation,
     }
diff --git a/packages/admin-next/dashboard/src/routes/orders/order-detail/loader.ts b/packages/admin-next/dashboard/src/routes/orders/order-detail/loader.ts
index 79066a729e..22b34aa4fc 100644
--- a/packages/admin-next/dashboard/src/routes/orders/order-detail/loader.ts
+++ b/packages/admin-next/dashboard/src/routes/orders/order-detail/loader.ts
@@ -1,7 +1,7 @@
 import { LoaderFunctionArgs } from "react-router-dom"
 
 import { ordersQueryKeys } from "../../../hooks/api/orders"
-import { client } from "../../../lib/client"
+import { sdk } from "../../../lib/client"
 import { queryClient } from "../../../lib/query-client"
 import { OrderRes } from "../../../types/api-responses"
 import { DEFAULT_FIELDS } from "./constants"
@@ -9,7 +9,7 @@ import { DEFAULT_FIELDS } from "./constants"
 const orderDetailQuery = (id: string) => ({
   queryKey: ordersQueryKeys.detail(id),
   queryFn: async () =>
-    client.orders.retrieve(id, {
+    sdk.admin.order.retrieve(id, {
       fields: DEFAULT_FIELDS,
     }),
 })
diff --git a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-add-products/components/add-products-to-sales-channel-form.tsx b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-add-products/components/add-products-to-sales-channel-form.tsx
index 33eda982c0..bae80e55b9 100644
--- a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-add-products/components/add-products-to-sales-channel-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-add-products/components/add-products-to-sales-channel-form.tsx
@@ -75,7 +75,7 @@ export const AddProductsToSalesChannelForm = ({
     error,
   } = useProducts(
     {
-      expand: "variants,sales_channels",
+      fields: "*variants,*sales_channels",
       ...searchParams,
     },
     {