diff --git a/packages/opencommerce/src/api/endpoints/cart/get-cart.ts b/packages/opencommerce/src/api/endpoints/cart/get-cart.ts
index fa2a3e8c7..edae474bd 100644
--- a/packages/opencommerce/src/api/endpoints/cart/get-cart.ts
+++ b/packages/opencommerce/src/api/endpoints/cart/get-cart.ts
@@ -20,7 +20,7 @@ const getCart: CartEndpoint['handlers']['getCart'] = async ({
     })
 
     return res.status(200).json({
-      data: normalizeCart(rawAnonymousCart),
+      data: rawAnonymousCart ? normalizeCart(rawAnonymousCart) : null,
     })
   }
 
diff --git a/packages/opencommerce/src/next.config.cjs b/packages/opencommerce/src/next.config.cjs
index d87cbb11f..82113f616 100644
--- a/packages/opencommerce/src/next.config.cjs
+++ b/packages/opencommerce/src/next.config.cjs
@@ -3,6 +3,6 @@ const commerce = require('./commerce.config.json')
 module.exports = {
   commerce,
   images: {
-    domains: [process.env.OPENCOMMERCE_STOREFRONT_API_URL],
+    domains: [process.env.OPENCOMMERCE_IMAGE_DOMAIN],
   },
 }
diff --git a/site/.env.template b/site/.env.template
index 0df5bcac2..5eab31d0a 100644
--- a/site/.env.template
+++ b/site/.env.template
@@ -52,6 +52,7 @@ NEXT_PUBLIC_COMMERCEJS_DEPLOYMENT_URL=
 
 OPENCOMMERCE_STOREFRONT_API_URL=
 OPENCOMMERCE_PRIMARY_SHOP_ID=
+OPENCOMMERCE_IMAGE_DOMAIN=
 
 SFCC_CLIENT_ID=
 SFCC_CLIENT_SECRET=