diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index 18127a24a..b6aa8f2ac 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -391,7 +391,7 @@ const fetchContextData = async (templateObject, jsrAuth) => {
       });
       contextData = data;
     }
-    return { contextData, useShopSpecificTemplate };
+    return { contextData, useShopSpecificTemplate, shopSpecificFolder };
   }
 
   return await generateTemplate(templateQueryToExecute, templateObject, useShopSpecificTemplate, shopSpecificFolder);
diff --git a/client/src/utils/graphQLmodifier.js b/client/src/utils/graphQLmodifier.js
index b50665c79..b6d479653 100644
--- a/client/src/utils/graphQLmodifier.js
+++ b/client/src/utils/graphQLmodifier.js
@@ -115,7 +115,7 @@ export function printQuery(query) {
  * @param templateObject
  * @param useShopSpecificTemplate
  * @param shopSpecificTemplate
- * @returns {Promise<{contextData: {}, useShopSpecificTemplate}>}
+ * @returns {Promise<{contextData: {}, useShopSpecificTemplate, shopSpecificTemplate}>}
  */
 export async function generateTemplate(templateQueryToExecute, templateObject, useShopSpecificTemplate, shopSpecificFolder) {
   // Advanced Filtering and Sorting modifications start here