diff --git a/core/pages/Category.js b/core/pages/Category.js
index 3af1d0cf8f..3a2b73a3ab 100644
--- a/core/pages/Category.js
+++ b/core/pages/Category.js
@@ -274,8 +274,8 @@ export default {
           }, storeView.storeCode)).href
         }
       ],
-      title: htmlDecode(this.$route.meta.title || this.categoryName),
-      meta: this.$route.meta.description ? [{ vmid: 'description', description: htmlDecode(this.$route.meta.description) }] : []
+      title: htmlDecode(this.category.meta_title || this.categoryName),
+      meta: this.category.meta_description ? [{ vmid: 'description', description: htmlDecode(this.category.meta_description) }] : []
     }
   }
 }
diff --git a/core/pages/Product.js b/core/pages/Product.js
index 75f0cb4ea2..303b600464 100644
--- a/core/pages/Product.js
+++ b/core/pages/Product.js
@@ -2,7 +2,7 @@ import { mapGetters } from 'vuex'
 
 import store from '@vue-storefront/store'
 import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus'
-import { htmlDecode, stripHTML } from '@vue-storefront/core/filters'
+import { htmlDecode } from '@vue-storefront/core/filters'
 import { currentStoreView, localizedRoute } from '@vue-storefront/store/lib/multistore'
 import { CompareProduct } from '@vue-storefront/core/modules/compare/components/Product.ts'
 import { AddToCompare } from '@vue-storefront/core/modules/compare/components/AddToCompare.ts'
@@ -225,7 +225,6 @@ export default {
   metaInfo () {
     const storeView = currentStoreView()
     return {
-      title: htmlDecode(this.$route.meta.title || this.productName),
       link: [
         { rel: 'amphtml',
           href: this.$router.resolve(localizedRoute({
@@ -238,7 +237,8 @@ export default {
           }, storeView.storeCode)).href
         }
       ],
-      meta: [{ vmid: 'description', description: this.product.short_description ? stripHTML(htmlDecode(this.product.short_description)) : htmlDecode(stripHTML(this.product.description)) }]
+      title: htmlDecode(this.product.meta_title || this.productName),
+      meta: this.product.meta_description ? [{ vmid: 'description', description: htmlDecode(this.product.meta_description) }] : []
     }
   }
 }