diff --git a/framework/bigcommerce/cart/use-cart.tsx b/framework/bigcommerce/cart/use-cart.tsx
index 0d2070f63..b3ea897c9 100644
--- a/framework/bigcommerce/cart/use-cart.tsx
+++ b/framework/bigcommerce/cart/use-cart.tsx
@@ -10,9 +10,7 @@ const defaultOpts = {
   method: 'GET',
 }
 
-type UseCartResponse = BigcommerceCart & Cart
-
-export const fetcher: HookFetcher<UseCartResponse | null, CartInput> = (
+export const fetcher: HookFetcher<BigcommerceCart | null, CartInput> = (
   options,
   { cartId },
   fetch
@@ -22,7 +20,7 @@ export const fetcher: HookFetcher<UseCartResponse | null, CartInput> = (
 
 export function extendHook(
   customFetcher: typeof fetcher,
-  swrOptions?: SwrOptions<UseCartResponse | null, CartInput>
+  swrOptions?: SwrOptions<BigcommerceCart | null, CartInput>
 ) {
   const useCart = () => {
     const response = useCommerceCart(defaultOpts, [], customFetcher, {
diff --git a/framework/bigcommerce/lib/normalize.ts b/framework/bigcommerce/lib/normalize.ts
index 535e77501..3827989f1 100644
--- a/framework/bigcommerce/lib/normalize.ts
+++ b/framework/bigcommerce/lib/normalize.ts
@@ -1,4 +1,4 @@
-import type { Cart as BigCommerceCart } from '../api/cart'
+import type { Cart as BigcommerceCart } from '../api/cart'
 import update from './immutability'
 
 function normalizeProductOption(productOption: any) {
@@ -68,7 +68,7 @@ export function normalizeProduct(productNode: any): Product {
   })
 }
 
-export function normalizeCart(data: BigCommerceCart): Cart {
+export function normalizeCart(data: BigcommerceCart): Cart {
   const d: BaseCart = data && {
     id: data.id,
     customerId: String(data.customer_id),
diff --git a/framework/bigcommerce/types.d.ts b/framework/bigcommerce/types.d.ts
new file mode 100644
index 000000000..d41b22f18
--- /dev/null
+++ b/framework/bigcommerce/types.d.ts
@@ -0,0 +1 @@
+interface Cart extends BaseCart {}
diff --git a/framework/commerce/utils/use-response.tsx b/framework/commerce/utils/use-response.tsx
index f3a1ed071..de1b5088c 100644
--- a/framework/commerce/utils/use-response.tsx
+++ b/framework/commerce/utils/use-response.tsx
@@ -25,7 +25,7 @@ const useResponse: UseResponse = (response, { descriptors, normalizer }) => {
           ? {
               data: {
                 get() {
-                  return normalizer(response.data)
+                  return response.data && normalizer(response.data)
                 },
                 enumerable: true,
               },
diff --git a/tsconfig.json b/tsconfig.json
index 0992a8cd6..67de1ee36 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -26,12 +26,6 @@
       "@framework": ["framework/bigcommerce"]
     }
   },
-  "include": [
-    "framework/types.d.ts",
-    "next-env.d.ts",
-    "**/*.ts",
-    "**/*.tsx",
-    "**/*.js"
-  ],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "**/*.js"],
   "exclude": ["node_modules", "components/wishlist"]
 }