diff --git a/templates/myaccount/my-address.php b/templates/myaccount/my-address.php
index 9c713928c79..8e5f8e9e70e 100644
--- a/templates/myaccount/my-address.php
+++ b/templates/myaccount/my-address.php
@@ -13,7 +13,7 @@ global $woocommerce;
 
 $customer_id = get_current_user_id();
 
-if ( get_option('woocommerce_ship_to_billing_address_only') == 'no' ) {
+if ( get_option('woocommerce_ship_to_billing_address_only') == 'no' && get_option('woocommerce_calc_shipping') !== 'no' ) {
 	$page_title = apply_filters( 'woocommerce_my_account_my_address_title', __( 'My Addresses', 'woocommerce' ) );
 	$get_addresses    = apply_filters( 'woocommerce_my_account_get_addresses', array(
 		'billing' => __( 'Billing Address', 'woocommerce' ),
@@ -70,4 +70,4 @@ $col = 1;
 
 <?php endforeach; ?>
 
-<?php if ( get_option('woocommerce_ship_to_billing_address_only') == 'no' ) echo '</div>'; ?>
\ No newline at end of file
+<?php if ( get_option('woocommerce_ship_to_billing_address_only') == 'no' ) echo '</div>'; ?>