diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cbd1f0d1d..0616bdd352 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## Draft
+- Load amp social share JS only when we have share icons enabled. [#968](https://github.com/bigcommerce/cornerstone/pull/968)
 
 ## 1.6.2 (2017-03-15)
 - Fix a bug that was not updating price and weight when an option is selected [#963](https://github.com/bigcommerce/cornerstone/pull/963)
diff --git a/templates/components/amp/products/product-view.html b/templates/components/amp/products/product-view.html
index adfe3e8210..461bc428b6 100644
--- a/templates/components/amp/products/product-view.html
+++ b/templates/components/amp/products/product-view.html
@@ -65,11 +65,13 @@ <h4 class="productAccordion-title">Description</h4>
         {{#if settings.show_product_reviews}}
             {{> components/amp/products/reviews reviews=product.reviews product=product urls=urls}}
         {{/if}}
-        <section expanded class="productAccordion">
-            <h4 class="productAccordion-title">Share</h4>
-            <div class="productAccordion-content social-share">
-                {{> components/amp/common/share }}
-            </div>
-        </section>
+        {{#if settings.add_this.buttons}}
+            <section expanded class="productAccordion">
+                <h4 class="productAccordion-title">Share</h4>
+                <div class="productAccordion-content social-share">
+                    {{> components/amp/common/share }}
+                </div>
+            </section>
+        {{/if}}
     </amp-accordion>
 </div>
diff --git a/templates/pages/amp/product.html b/templates/pages/amp/product.html
index 1a6bbfc3cc..27d79a8c7d 100644
--- a/templates/pages/amp/product.html
+++ b/templates/pages/amp/product.html
@@ -13,9 +13,11 @@
 {{#partial "amp-scripts"}}
     <script async custom-element="amp-accordion" src="https://cdn.ampproject.org/v0/amp-accordion-0.1.js"></script>
     <script async custom-element="amp-carousel" src="https://cdn.ampproject.org/v0/amp-carousel-0.1.js"></script>
-    <script async custom-element="amp-social-share" src="https://cdn.ampproject.org/v0/amp-social-share-0.1.js"></script>
+    {{#if settings.add_this.buttons}}
+        <script async custom-element="amp-social-share" src="https://cdn.ampproject.org/v0/amp-social-share-0.1.js"></script>
+    {{/if}}
     {{#if product.options}}
-    <script async custom-element="amp-iframe" src="https://cdn.ampproject.org/v0/amp-iframe-0.1.js"></script>
+        <script async custom-element="amp-iframe" src="https://cdn.ampproject.org/v0/amp-iframe-0.1.js"></script>
     {{/if}}
     {{#if product.videos}}
         <script async custom-element="amp-youtube" src="https://cdn.ampproject.org/v0/amp-youtube-0.1.js"></script>