diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 81a860ad21b..bcd6e5d5a97 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -110,8 +110,8 @@
                 and main_object.website_meta_description or website_meta_description"/>
             <t t-set="meta_keywords" t-value="main_object and 'website_meta_keywords' in main_object
                 and main_object.website_meta_keywords or website_meta_keywords"/>
-            <meta t-if="meta_description" name="description" t-att-content="meta_description"/>
-            <meta t-if="meta_keywords" name="keywords" t-att-content="meta_keywords"/>
+            <meta t-if="meta_description or editable" name="description" t-att-content="meta_description"/>
+            <meta t-if="meta_keywords or editable" name="keywords" t-att-content="meta_keywords"/>
 
             <!-- OpenGraph tags for Facebook sharing -->
             <meta property="og:title" t-att-content="additional_title" />