diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79a2530b73..93da9a714e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Remove head.rsslinks [#1539](https://github.com/bigcommerce/cornerstone/pull/1539)
 - Prevent heading from displaying when no price ranges are available [#1545](https://github.com/bigcommerce/cornerstone/pull/1545)
 - Utilize srcset for responsive images [#1507](https://github.com/bigcommerce/cornerstone/pull/1507)
+- Clean up conditional logic in a couple component templates [#1547](https://github.com/bigcommerce/cornerstone/pull/1547)
 
 ## 3.5.1 (2019-06-24)
 - Fix conditional logic in share.html [#1522](https://github.com/bigcommerce/cornerstone/pull/1522)
diff --git a/templates/components/amp/products/product-view-details.html b/templates/components/amp/products/product-view-details.html
index c484efae36..12dde634c8 100644
--- a/templates/components/amp/products/product-view-details.html
+++ b/templates/components/amp/products/product-view-details.html
@@ -89,11 +89,9 @@ <h2 class="modal-header-title">{{lang 'products.bulk_pricing.modal_title'}}</h2>
                                 {{lang 'products.bulk_pricing.range' min=min max=max}}
                                 {{#if type '===' 'percent'}}
                                     {{lang 'products.bulk_pricing.percent' discount=discount.formatted}}
-                                {{/if}}
-                                {{#if type '===' 'fixed'}}
+                                {{else if type '===' 'fixed'}}
                                     {{lang 'products.bulk_pricing.fixed' discount=discount.formatted}}
-                                {{/if}}
-                                {{#if type '===' 'price'}}
+                                {{else if type '===' 'price'}}
                                     {{lang 'products.bulk_pricing.price' discount=discount.formatted}}
                                 {{/if}}
                             </li>
diff --git a/templates/components/products/bulk-discount-rates.html b/templates/components/products/bulk-discount-rates.html
index c22e03fcd1..7227455402 100644
--- a/templates/components/products/bulk-discount-rates.html
+++ b/templates/components/products/bulk-discount-rates.html
@@ -19,11 +19,9 @@ <h2 class="modal-header-title">{{lang 'products.bulk_pricing.modal_title'}}</h2>
                     {{lang 'products.bulk_pricing.range' min=min max=max}}
                     {{#if type '===' 'percent'}}
                     {{lang 'products.bulk_pricing.percent' discount=discount.formatted}}
-                    {{/if}}
-                    {{#if type '===' 'fixed'}}
+                    {{else if type '===' 'fixed'}}
                     {{lang 'products.bulk_pricing.fixed' discount=discount.formatted}}
-                    {{/if}}
-                    {{#if type '===' 'price'}}
+                    {{else if type '===' 'price'}}
                     {{lang 'products.bulk_pricing.price' discount=discount.formatted}}
                     {{/if}}
                 </li>