diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea1bd538ee..4eef3c4cf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Draft
+- Expose shopper messaging on Cart page to show that maximum discount limit has been reached [#2620](https://github.com/bigcommerce/cornerstone/pull/2620)
 - Fix `onThemeBundleMain` binding to `window` load instead of script element, guard `optionChangeDecorator` against null response on error, and fix `updateWalletButtonsView` crash on cart edit modal [#2615](https://github.com/bigcommerce/cornerstone/pull/2615)
 - Add to Cart and quantity buttons disabled when BCData is empty [#2612](https://github.com/bigcommerce/cornerstone/pull/2612)
 - Introduce strikethrough display for discounted shipping quote prices on cart page [#2611](https://github.com/bigcommerce/cornerstone/pull/2611)
diff --git a/assets/scss/components/stencil/cart/_cart.scss b/assets/scss/components/stencil/cart/_cart.scss
index 781adbe4db..e3cf9afd4d 100644
--- a/assets/scss/components/stencil/cart/_cart.scss
+++ b/assets/scss/components/stencil/cart/_cart.scss
@@ -714,6 +714,13 @@ $card-preview-zoom-bottom-offset:       6rem;
 .cart-coupon-name {
     flex: 1;
     margin-left: spacing("sixth");
+    display: inline-flex;
+    flex-direction: column;
+
+    .cart-coupon-limit {
+        color: stencilColor("color-success");
+        font-size: fontSize("tiny");
+    }
 }
 
 .coupon-code-cancel,
diff --git a/lang/en.json b/lang/en.json
index 627ab42dcf..d7c996e1ad 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -93,7 +93,8 @@
             "button": "Apply",
             "coupon_code": "Enter your coupon code",
             "code_label": "Coupon ({code})",
-            "remove": "Remove"
+            "remove": "Remove",
+            "maximum_discount_applied": "Maximum discount applied"
         },
         "gift_certificates": {
             "apply_gift_certificate": "Apply gift certificate",
diff --git a/package-lock.json b/package-lock.json
index 8bd137f6fb..4abb77b272 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "bigcommerce-cornerstone",
-      "version": "6.18.0-rc.1",
+      "version": "6.18.2",
       "license": "MIT",
       "dependencies": {
         "@bigcommerce/stencil-utils": "6.19.0",
diff --git a/templates/components/cart/totals.html b/templates/components/cart/totals.html
index 7e15541f5f..54bb20512c 100644
--- a/templates/components/cart/totals.html
+++ b/templates/components/cart/totals.html
@@ -26,7 +26,12 @@
                         <li class="cart-discount-item">
                             <div class="cart-discount-item-label">
                                 <i class="icon" aria-hidden="true"><svg><use href="#icon-promotions" /></svg></i>
-                                <span class="cart-coupon-name">{{lang 'cart.automatic_discount'}}</span>
+                                <span class="cart-coupon-name">
+                                    {{lang 'cart.automatic_discount'}}
+                                    {{#if cart.order_based_auto_discount_max_limit_reached}}
+                                        <span class="cart-coupon-limit">{{lang 'cart.coupons.maximum_discount_applied'}}</span>
+                                    {{/if}}
+                                </span>
                             </div>
                             <div class="cart-discount-item-value">
                                 {{cart.order_based_auto_discount_total.formatted}}
@@ -48,11 +53,16 @@
                         <li class="cart-discount-item">
                             <div class="cart-discount-item-label">
                                 <i class="icon" aria-hidden="true"><svg><use href="#icon-promotions" /></svg></i>
-                                {{#if display_name}}
-                                    <span class="cart-coupon-name">{{display_name}} ({{code}})</span>
-                                {{else}}
-                                    <span class="cart-coupon-name">{{code}}</span>
-                                {{/if}}
+                                <span class="cart-coupon-name">
+                                    {{#if display_name}}
+                                        {{display_name}} ({{code}})
+                                    {{else}}
+                                        {{code}}
+                                    {{/if}}
+                                    {{#if has_max_limit_reached}}
+                                        <span class="cart-coupon-limit">{{lang 'cart.coupons.maximum_discount_applied'}}</span>
+                                    {{/if}}
+                                </span>
                             </div>
                             <div class="cart-discount-item-value">
                                 {{#if discount.value '===' 0}}-{{/if}}{{discount.formatted}}