diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index b06ca0ee9..77e177b0f 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -837,6 +837,7 @@ class e_parse
 		$parse = e107::getScParser();
 		$parse->setMode('schema');
 		$text = e107::getScParser()->parseCodes($text, $parseSCFiles, $extraCodes, $eVars);
+		$text = str_replace('<!-- >', '', $text); // cleanup
 		$parse->setMode('default');
 		return $text;
 
diff --git a/e107_plugins/faqs/faqs.php b/e107_plugins/faqs/faqs.php
index 8b59b71d4..894ecc9be 100644
--- a/e107_plugins/faqs/faqs.php
+++ b/e107_plugins/faqs/faqs.php
@@ -419,7 +419,7 @@ class faq
 			$FAQ_LISTALL['end'] = str_replace($tsrch,$trepl, $FAQ_LISTALL['end']);
 		}
 
-
+		$schemaItems = [];
 		foreach ($data as $rw)
 		{
 			$rw['faq_sef'] = eHelper::title2sef($tp->toText($rw['faq_question']),'dashl');
@@ -428,7 +428,7 @@ class faq
 
 			if(!empty($schemaTemplate['item']))
 			{
-				$schema .= $tp->parseSchemaTemplate($schemaTemplate['item'],false,$sc);
+				$schemaItems[] = $tp->parseSchemaTemplate($schemaTemplate['item'],false,$sc);
 			}
 
 			if($sc->item == $rw['faq_id'])
@@ -452,6 +452,12 @@ class faq
 			$prevcat = $rw['faq_info_order'];
 			$sc->counter++;
 		}
+
+		if(!empty($schemaItems))
+		{
+			$schema .= implode(",", $schemaItems);
+		}
+
 		$text .= ($start) ? $tp->parseTemplate($FAQ_LISTALL['end'], true, $sc) : "";
 
 		if(!empty($schemaTemplate['end']))
diff --git a/e107_plugins/faqs/templates/faqs_template.php b/e107_plugins/faqs/templates/faqs_template.php
index 1fe354576..fdb2fad01 100644
--- a/e107_plugins/faqs/templates/faqs_template.php
+++ b/e107_plugins/faqs/templates/faqs_template.php
@@ -34,3 +34,21 @@ $FAQS_TEMPLATE['all']['end'] = "
 $FAQS_TEMPLATE['caption'] = "{FAQ_CAPTION} <small>{FAQ_COUNT}</small>";
 
 
+/** @experimental */
+$FAQS_TEMPLATE['schema']['start'] = '{
+      "@context": "https://schema.org",
+      "@type": "FAQPage",
+      "mainEntity": [';
+
+$FAQS_TEMPLATE['schema']['item'] = '{
+        "@type": "Question",
+        "name": "{FAQ_QUESTION}",
+        "acceptedAnswer": {
+          "@type": "Answer",
+          "text": "{FAQ_ANSWER}"
+        }
+}';
+
+$FAQS_TEMPLATE['schema']['end'] = ']
+    }
+   ';