diff --git a/src/Resources/views/storefront/page/checkout/order/wallee.html.twig b/src/Resources/views/storefront/page/checkout/order/wallee.html.twig
index 9cd0171..0614980 100644
--- a/src/Resources/views/storefront/page/checkout/order/wallee.html.twig
+++ b/src/Resources/views/storefront/page/checkout/order/wallee.html.twig
@@ -69,7 +69,9 @@
 
 								{% block page_checkout_confirm_address_billing_data %}
 									<div class="confirm-address-billing">
-										{% if billingAddress.id is same as(shippingAddress.id) %}
+										{% set shippingAddress = context.customer.activeShippingAddress %}
+					                                        {% set billingAddress = context.customer.activeBillingAddress %}
+					                                        {% if shippingAddress.id is defined and shippingAddress.id is same as(billingAddress.id) %}
 											{% block page_checkout_confirm_address_billing_data_equal %}
 												<p>
 													{{ "checkout.addressEqualText"|trans|sw_sanitize }}