diff --git a/config/theme.yml b/config/theme.yml
index b24ae1eb..a8b35e3f 100644
--- a/config/theme.yml
+++ b/config/theme.yml
@@ -1,6 +1,6 @@
 name: classic
 display_name: Classic
-version: 3.0.6
+version: 3.0.7
 author:
   name: "PrestaShop SA and Contributors"
   email: "contact@prestashop.com"
diff --git a/templates/_partials/microdata/product-jsonld.tpl b/templates/_partials/microdata/product-jsonld.tpl
index 3f5f3253..27f15c51 100644
--- a/templates/_partials/microdata/product-jsonld.tpl
+++ b/templates/_partials/microdata/product-jsonld.tpl
@@ -90,11 +90,7 @@
       "sku": "{if $product.reference}{$product.reference}{else}{$product.id}{/if}",
       "mpn": "{if $product.mpn}{$product.mpn}{elseif $product.reference}{$product.reference}{else}{$product.id}{/if}",
       {if $product.ean13}"gtin13": "{$product.ean13}",{elseif $product.upc}"gtin13": "0{$product.upc}",{/if}
-      {if $product.condition == 'new'}"itemCondition": "https://schema.org/NewCondition",{/if}
-      {if $product.show_condition > 0}
-        {if $product.condition == 'used'}"itemCondition": "https://schema.org/UsedCondition",{/if}
-        {if $product.condition == 'refurbished'}"itemCondition": "https://schema.org/RefurbishedCondition",{/if}
-      {/if}
+      {if !empty($product.show_condition) && !empty($product.condition)}"itemCondition": "{$product.condition.schema_url}",{/if}
       "availability": "{$product.seo_availability}",
       "seller": {
         "@type": "Organization",