diff --git a/src/commerce.js b/src/commerce.js
index <HASH>..<HASH> 100644
--- a/src/commerce.js
+++ b/src/commerce.js
@@ -39,8 +39,11 @@ export function commerceItems (accountData) {
     return []
   }
 
+  const buys = accountData.commerce.buys || []
+  const sells = accountData.commerce.sells || []
+
   return [].concat(
-    accountData.commerce.buys.map(x => ({id: x.item_id})),
-    accountData.commerce.sells.map(x => ({id: x.item_id}))
+    buys.map(x => ({id: x.item_id})),
+    sells.map(x => ({id: x.item_id}))
   )
 }
diff --git a/tests/index.spec.js b/tests/index.spec.js
index <HASH>..<HASH> 100644
--- a/tests/index.spec.js
+++ b/tests/index.spec.js
@@ -154,6 +154,7 @@ describe('account value', () => {
     ])
 
     expect(allItemIds({})).to.deep.equal([])
+    expect(allItemIds({commerce: {buys: null, sells: null}})).to.deep.equal([])
   })
 
   it('can fetch all bound ids', () => {
Fix commerce failing if the keys themselves are set but not populated