diff --git a/example-templates/dist/shop/checkout/addresses.twig b/example-templates/dist/shop/checkout/addresses.twig
index f7ab646ba8..e22bceb778 100644
--- a/example-templates/dist/shop/checkout/addresses.twig
+++ b/example-templates/dist/shop/checkout/addresses.twig
@@ -43,6 +43,17 @@ Outputs a form for collecting an order’s shipping and billing address.
             sourceIdName: 'sourceShippingAddressId',
           }) }}
 
+          {% if currentUser and addresses|length %}
+            <div class="mt-3">
+              <label>
+                {{ input('checkbox', 'makePrimaryShippingAddress', 1, {
+                  id: 'makePrimaryShippingAddress',
+                }) }}
+                {{ 'Make this my default shipping address'|t }}
+              </label>
+            </div>
+          {% endif %}
+
           <hr class="my-5">
 
           {{ hiddenInput('billingAddressSameAsShipping', 0) }}
@@ -57,17 +68,6 @@ Outputs a form for collecting an order’s shipping and billing address.
             </label>
           </div>
 
-          {% if currentUser %}
-          <div class="mt-3">
-            <label>
-              {{ input('checkbox', 'makePrimaryShippingAddress', 1, {
-                id: 'makePrimaryShippingAddress',
-              }) }}
-              {{ 'Make this my default shipping address'|t }}
-            </label>
-          </div>
-          {% endif %}
-
           <div class="mt-8">
             {{ include('shop/_private/address/fieldset', {
               title: 'Billing Address'|t,
@@ -78,19 +78,19 @@ Outputs a form for collecting an order’s shipping and billing address.
             }) }}
           </div>
 
-          <hr class="my-5">
-
-          {% if currentUser %}
-          <div class="mt-3">
-            <label>
-              {{ input('checkbox', 'makePrimaryBillingAddress', 1, {
-                id: 'makePrimaryBillingAddress',
-              }) }}
-              {{ 'Make this my default billing address'|t }}
-            </label>
-          </div>
+          {% if currentUser and addresses|length %}
+            <div class="mt-3">
+              <label>
+                {{ input('checkbox', 'makePrimaryBillingAddress', 1, {
+                  id: 'makePrimaryBillingAddress',
+                }) }}
+                {{ 'Make this my default billing address'|t }}
+              </label>
+            </div>
           {% endif %}
 
+          <hr class="my-5">
+
           <div class="mt-3 flex justify-end">
             {{ tag('button', {
               type: 'submit',
diff --git a/example-templates/src/shop/checkout/addresses.twig b/example-templates/src/shop/checkout/addresses.twig
index aa242e3f8f..30e395057d 100755
--- a/example-templates/src/shop/checkout/addresses.twig
+++ b/example-templates/src/shop/checkout/addresses.twig
@@ -43,6 +43,17 @@ Outputs a form for collecting an order’s shipping and billing address.
             sourceIdName: 'sourceShippingAddressId',
           }) }}
 
+          {% if currentUser and addresses|length %}
+            <div class="mt-3">
+              <label>
+                {{ input('checkbox', 'makePrimaryShippingAddress', 1, {
+                  id: 'makePrimaryShippingAddress',
+                }) }}
+                {{ 'Make this my default shipping address'|t }}
+              </label>
+            </div>
+          {% endif %}
+
           <hr class="my-5">
 
           {{ hiddenInput('billingAddressSameAsShipping', 0) }}
@@ -57,17 +68,6 @@ Outputs a form for collecting an order’s shipping and billing address.
             </label>
           </div>
 
-          {% if currentUser %}
-          <div class="mt-3">
-            <label>
-              {{ input('checkbox', 'makePrimaryShippingAddress', 1, {
-                id: 'makePrimaryShippingAddress',
-              }) }}
-              {{ 'Make this my default shipping address'|t }}
-            </label>
-          </div>
-          {% endif %}
-
           <div class="mt-8">
             {{ include('[[folderName]]/_private/address/fieldset', {
               title: 'Billing Address'|t,
@@ -78,19 +78,19 @@ Outputs a form for collecting an order’s shipping and billing address.
             }) }}
           </div>
 
-          <hr class="my-5">
-
-          {% if currentUser %}
-          <div class="mt-3">
-            <label>
-              {{ input('checkbox', 'makePrimaryBillingAddress', 1, {
-                id: 'makePrimaryBillingAddress',
-              }) }}
-              {{ 'Make this my default billing address'|t }}
-            </label>
-          </div>
+          {% if currentUser and addresses|length %}
+            <div class="mt-3">
+              <label>
+                {{ input('checkbox', 'makePrimaryBillingAddress', 1, {
+                  id: 'makePrimaryBillingAddress',
+                }) }}
+                {{ 'Make this my default billing address'|t }}
+              </label>
+            </div>
           {% endif %}
 
+          <hr class="my-5">
+
           <div class="mt-3 flex justify-end">
             {{ tag('button', {
               type: 'submit',