diff --git a/assets/js/base/context/hooks/use-checkout-address.ts b/assets/js/base/context/hooks/use-checkout-address.ts index 71a5ab7a49b..eb794558539 100644 --- a/assets/js/base/context/hooks/use-checkout-address.ts +++ b/assets/js/base/context/hooks/use-checkout-address.ts @@ -90,8 +90,7 @@ export const useCheckoutAddress = (): CheckoutAddress => { useShippingAsBilling, setUseShippingAsBilling: __internalSetUseShippingAsBilling, showShippingFields: ! forcedBillingAddress && needsShipping, - showBillingFields: - forcedBillingAddress || ! needsShipping || ! useShippingAsBilling, + showBillingFields: ! needsShipping || ! useShippingAsBilling, forcedBillingAddress, }; }; diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/frontend.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/frontend.tsx index 86b4ed1c746..663fb04a652 100644 --- a/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/frontend.tsx +++ b/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/frontend.tsx @@ -38,9 +38,9 @@ const FrontendBlock = ( { showCompanyField, showPhoneField, } = useCheckoutBlockContext(); - const { showBillingFields } = useCheckoutAddress(); + const { showBillingFields, forcedBillingAddress } = useCheckoutAddress(); - if ( ! showBillingFields ) { + if ( ! showBillingFields && ! forcedBillingAddress ) { return null; }