diff --git a/CHANGELOG.md b/CHANGELOG.md
index 904fe39364..8db3802ece 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed non-working functionality from schema.json [#2301][https://github.com/bigcommerce/cornerstone/pull/2301]
 - Refactored `hide_price_from_guests` logic around `show_cart_action` use [#2304](https://github.com/bigcommerce/cornerstone/pull/2304)
 - Removed all Google AMP template files [#2308](https://github.com/bigcommerce/cornerstone/pull/2308)
+- Customer order summary with both physical and digital items shows shipping as null [#2309](https://github.com/bigcommerce/cornerstone/pull/2309)
 
 ## 6.7.0 (11-03-2022)
 - Fixed escaping on created store account confirm message. [#2265]https://github.com/bigcommerce/cornerstone/pull/2265
diff --git a/templates/components/account/order-contents.html b/templates/components/account/order-contents.html
index f2b452365f..cfea272000 100644
--- a/templates/components/account/order-contents.html
+++ b/templates/components/account/order-contents.html
@@ -4,9 +4,11 @@ <h3 class="account-heading">{{lang 'account.orders.details.order_contents'}}</h3
     {{#each order.items}}
         {{#if shipping_rows.length}}
             {{#each shipping_rows}}
-                <li class="account-listShipping">
-                    <h5 class="account-listShipping-title">{{lang 'account.orders.details.ship_to_multi' street=address city=city state=state zip=zip country=country}}</h5>
-                </li>
+                {{#if is_shipping}}
+                    <li class="account-listShipping">
+                        <h5 class="account-listShipping-title">{{lang 'account.orders.details.ship_to_multi' street=address city=city state=state zip=zip country=country}}</h5>
+                    </li>
+                {{/if}}
             {{/each}}
         {{/if}}
     <li class="account-listItem">