diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdb4468c79..88e3fe1790 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Draft
 - Fix for sort disappearing on range update with product filtering [#1232](https://github.com/bigcommerce/cornerstone/pull/1232)
 - No longer escaping HTML content in blog summaries. [#1238](https://github.com/bigcommerce/cornerstone/pull/1238)
+- Fix logo image dimensions on AMP pages. [#1239](https://github.com/bigcommerce/cornerstone/pull/1239)
 
 ## 1.18.0 (2018-05-09)
 - Add the +/- icons for the category filtering [#1211](https://github.com/bigcommerce/cornerstone/pull/1211)
@@ -14,7 +15,7 @@
 - Fix for excess whitespace in multiline text field product option [#1222](https://github.com/bigcommerce/cornerstone/pull/1222)
 - Fix for faceted search display. [#1225](https://github.com/bigcommerce/cornerstone/pull/1225)
 - Fix for calls with empty files in Safari. [#1210](https://github.com/bigcommerce/cornerstone/pull/1210)
-
+ 
 ## 1.17.0 (2018-04-26)
 - Fix empty object issue in app.js [#1204](https://github.com/bigcommerce/cornerstone/pull/1204)
 - Fix product layout when shop by price disabled [#1205](https://github.com/bigcommerce/cornerstone/pull/1205)
diff --git a/templates/components/amp/common/store-logo.html b/templates/components/amp/common/store-logo.html
index 95c0b35de2..7868152924 100644
--- a/templates/components/amp/common/store-logo.html
+++ b/templates/components/amp/common/store-logo.html
@@ -1,11 +1,18 @@
 <a href="{{urls.home}}" class="amp-header-link">
     {{#if settings.store_logo.image}}
-        <amp-img
-            src="{{getImage settings.store_logo.image 'logo_size'}}"
-            width="100"
-            height="50"
+        <amp-img src="{{getImage settings.store_logo.image 'logo_size'}}"
+            {{#if theme_settings.logo_size '===' 'original' }}
+                width="100"
+                height="50"
+            {{else}}
+                width="{{first (split theme_settings.logo_size 'x')}}"
+                height="{{last (split theme_settings.logo_size 'x')}}"
+                layout="responsive"
+                sizes="(min-height: {{last (split theme_settings.logo_size 'x')}}%)"
+            {{/if}}
             alt="{{settings.store_logo.title}}">
         </amp-img>
+
     {{else}}
         <span class="amp-header-logo-text">{{settings.store_logo.title}}</span>
     {{/if}}