diff --git a/assets/js/settings/blocks/constants.ts b/assets/js/settings/blocks/constants.ts
index a7276704189..8436f26424c 100644
--- a/assets/js/settings/blocks/constants.ts
+++ b/assets/js/settings/blocks/constants.ts
@@ -34,15 +34,15 @@ export const WC_BLOCKS_IMAGE_URL = blocksConfig.pluginUrl + 'images/';
 export const WC_BLOCKS_BUILD_URL = blocksConfig.pluginUrl + 'build/';
 export const WC_BLOCKS_PHASE = blocksConfig.buildPhase;
 export const SHOP_URL = STORE_PAGES.shop?.permalink;
-export const CHECKOUT_PAGE_ID = STORE_PAGES.checkout.id;
-export const CHECKOUT_URL = STORE_PAGES.checkout.permalink;
-export const PRIVACY_URL = STORE_PAGES.privacy.permalink;
-export const PRIVACY_PAGE_NAME = STORE_PAGES.privacy.title;
-export const TERMS_URL = STORE_PAGES.terms.permalink;
-export const TERMS_PAGE_NAME = STORE_PAGES.terms.title;
-export const CART_PAGE_ID = STORE_PAGES.cart.id;
-export const CART_URL = STORE_PAGES.cart.permalink;
-export const LOGIN_URL = STORE_PAGES.myaccount.permalink
+export const CHECKOUT_PAGE_ID = STORE_PAGES.checkout?.id;
+export const CHECKOUT_URL = STORE_PAGES.checkout?.permalink;
+export const PRIVACY_URL = STORE_PAGES.privacy?.permalink;
+export const PRIVACY_PAGE_NAME = STORE_PAGES.privacy?.title;
+export const TERMS_URL = STORE_PAGES.terms?.permalink;
+export const TERMS_PAGE_NAME = STORE_PAGES.terms?.title;
+export const CART_PAGE_ID = STORE_PAGES.cart?.id;
+export const CART_URL = STORE_PAGES.cart?.permalink;
+export const LOGIN_URL = STORE_PAGES.myaccount?.permalink
 	? STORE_PAGES.myaccount.permalink
 	: getSetting( 'wpLoginUrl', '/wp-login.php' );
 export const LOCAL_PICKUP_ENABLED = getSetting< boolean >(
diff --git a/storybook/webpack.config.js b/storybook/webpack.config.js
index cc3aee6294d..abbddd35ea5 100644
--- a/storybook/webpack.config.js
+++ b/storybook/webpack.config.js
@@ -63,5 +63,14 @@ module.exports = ( { config: storybookConfig } ) => {
 		} )
 	);
 
+	storybookConfig.module.rules = storybookConfig.module.rules.filter(
+		( rule ) =>
+			! (
+				rule.use &&
+				typeof rule.use.loader === 'string' &&
+				rule.use.loader.indexOf( 'babel-loader' ) >= 0
+			)
+	);
+
 	return storybookConfig;
 };