diff --git a/packages/medusa/src/api/routes/store/auth/create-session.js b/packages/medusa/src/api/routes/store/auth/create-session.js
index 38d3481250..836a9867d6 100644
--- a/packages/medusa/src/api/routes/store/auth/create-session.js
+++ b/packages/medusa/src/api/routes/store/auth/create-session.js
@@ -35,14 +35,11 @@ export default async (req, res) => {
     }
   )
 
-  const data = await customerService.decorate(result.customer, [
-    "_id",
-    "email",
-    "orders",
-    "shipping_addresses",
-    "first_name",
-    "last_name",
-  ])
+  const data = await customerService.decorate(
+    result.customer,
+    ["_id", "email", "orders", "shipping_addresses", "first_name", "last_name"],
+    ["orders"]
+  )
 
   res.json({ customer: data })
 }
diff --git a/packages/medusa/src/api/routes/store/customers/get-customer.js b/packages/medusa/src/api/routes/store/customers/get-customer.js
index 3bee883152..2372276e87 100644
--- a/packages/medusa/src/api/routes/store/customers/get-customer.js
+++ b/packages/medusa/src/api/routes/store/customers/get-customer.js
@@ -3,11 +3,11 @@ export default async (req, res) => {
   try {
     const customerService = req.scope.resolve("customerService")
     let customer = await customerService.retrieve(id)
-    customer = customerService.decorate(customer._id, [
-      "email",
-      "first_name",
-      "last_name",
-    ])
+    customer = customerService.decorate(
+      customer._id,
+      ["email", "first_name", "last_name", "shipping_addresses"],
+      ["orders"]
+    )
     res.json({ customer })
   } catch (err) {
     throw err
diff --git a/packages/medusa/src/services/customer.js b/packages/medusa/src/services/customer.js
index 4de18adedd..2f3e29664b 100644
--- a/packages/medusa/src/services/customer.js
+++ b/packages/medusa/src/services/customer.js
@@ -288,7 +288,10 @@ class CustomerService extends BaseService {
 
     if (expandFields.includes("orders")) {
       decorated.orders = await Promise.all(
-        customer.orders.map(async o => this.orderService_.retrieve(o))
+        customer.orders.map(async o => {
+          const order = await this.orderService_.retrieve(o)
+          return this.orderService_.decorate(order)
+        })
       )
     }