ampproject · jshamble · Apr 19, 2022 · Apr 7, 2022 · Apr 11, 2022 · Apr 11, 2022
diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js b/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js
@@ -78,22 +78,26 @@ export class AmpStoryShoppingAttachment extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     this.pageEl_ = this.element.closest('amp-story-page');
+
     this.shoppingTags_ = Array.from(
       this.pageEl_.querySelectorAll('amp-story-shopping-tag')
     );
 
-    getShoppingConfig(this.element, this.pageEl_.id).then((config) =>
-      storeShoppingConfig(this.pageEl_, config)
-    );
+    return getShoppingConfig(this.element, this.pageEl_.id)
+      .then((config) => {
+        if (
+          this.shoppingTags_.length === 0 ||
+          Object.keys(config).length === 0
+        ) {
+          return;
+        }
 
-    if (this.shoppingTags_.length === 0) {
-      return;
-    }
+        storeShoppingConfig(this.pageEl_, config);
 
-    return this.localizationService_
-      .getLocalizedStringAsync(
-        LocalizedStringId_Enum.AMP_STORY_SHOPPING_CTA_LABEL
-      )
+        return this.localizationService_.getLocalizedStringAsync(
+          LocalizedStringId_Enum.AMP_STORY_SHOPPING_CTA_LABEL
+        );
+      })
       .then((ctaText) => {
         this.attachmentEl_ = (
           <amp-story-page-attachment
@@ -110,7 +114,11 @@ export class AmpStoryShoppingAttachment extends AMP.BaseElement {
 
   /** @override */
   layoutCallback() {
-    if (this.shoppingTags_.length === 0) {
+    if (
+      this.shoppingTags_.length === 0 ||
+      this.storeService_.get(StateProperty.SHOPPING_DATA)[this.pageEl_.id] ===
+        undefined
+    ) {
       return;
     }
     loadFonts(this.win, FONTS_TO_LOAD);