diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index df3a4298e5b..97020aa35de 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -57,7 +57,7 @@
 
 <template id="layout" name="Main layout">&lt;!DOCTYPE html&gt;
     <html t-att-lang="lang and lang.replace('_', '-')"
-          t-att-data-website-id="website.id if editable else None"
+          t-att-data-website-id="website.id if editable and website else None"
           t-att-data-editable="'1' if editable else None"
           t-att-data-translatable="'1' if translatable else None"
           t-att-data-view-xmlid="xmlid if editable else None"
@@ -81,10 +81,10 @@
                 and main_object.website_meta_keywords or website_meta_keywords"/>
             <title><t t-esc="title"/></title>
 
-            <t t-set="languages" t-value="website.get_languages()"/>
+            <t t-set="languages" t-value="website.get_languages() if website else None"/>
             <t t-if="request.website_multilang">
                 <t t-foreach="languages" t-as="lg">
-                    <t t-set="force_lang" t-value="lg[0] if lg[0] != website.default_lang_code else None"/>
+                    <t t-set="force_lang" t-value="lg[0] if website and lg[0] != website.default_lang_code else None"/>
                     <link rel="alternate" t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=force_lang)" t-att-hreflang="lg[0].replace('_', '-').lower()" />
                 </t>
             </t>
@@ -154,12 +154,12 @@
                                     <li t-ignore="true"><i class="fa fa-envelope"></i>  <span t-field="res_company.email"></span></li>
                                 </ul>
                                 <h2>
-                                    <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>
-                                    <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="fa fa-twitter"/></a>
-                                    <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="fa fa-linkedin"/></a>
-                                    <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="fa fa-youtube-play"/></a>
-                                    <a t-att-href="website.social_googleplus" t-if="website.social_googleplus"><i class="fa fa-google-plus-square"/></a>
-                                    <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a>
+                                    <a t-att-href="website.social_facebook" t-if="website and website.social_facebook"><i class="fa fa-facebook-square"/></a>
+                                    <a t-att-href="website.social_twitter" t-if="website and website.social_twitter"><i class="fa fa-twitter"/></a>
+                                    <a t-att-href="website.social_linkedin" t-if="website and website.social_linkedin"><i class="fa fa-linkedin"/></a>
+                                    <a t-att-href="website.social_youtube" t-if="website and website.social_youtube"><i class="fa fa-youtube-play"/></a>
+                                    <a t-att-href="website.social_googleplus" t-if="website and website.social_googleplus"><i class="fa fa-google-plus-square"/></a>
+                                    <a t-att-href="website.social_github" t-if="website and website.social_github"><i class="fa fa-github"/></a>
                                 </h2>
                             </div>
                             <div class="col-md-5 col-lg-offset-1">
@@ -181,13 +181,13 @@
                                 <ul class="list-inline js_language_selector mt16" t-if="(request.website_multilang and len(languages) &gt; 1) or editable">
                                     <li t-foreach="languages" t-as="lg">
                                         <a t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=lg[0])"
-                                           t-att-data-default-lang="editable and 'true' if lg[0] == website.default_lang_code else None">
+                                           t-att-data-default-lang="editable and 'true' if website and lg[0] == website.default_lang_code else None">
                                             <t t-esc="lg[1].split('/').pop()"/>
                                         </a>
                                     </li>
                                     <li groups="base.group_website_publisher">
                                         <t t-set="url_return" t-value="url_for('', '[lang]') + '?' + keep_query()"/>
-                                        <a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id}&amp;url_return=#{url_return}">
+                                        <a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id if website else ''}&amp;url_return=#{url_return}">
                                             <i class="fa fa-plus-circle"/>
                                             Add a language...
                                         </a>
diff --git a/addons/website_report/views/layouts.xml b/addons/website_report/views/layouts.xml
index 718679b9135..e2a80b0ff03 100644
--- a/addons/website_report/views/layouts.xml
+++ b/addons/website_report/views/layouts.xml
@@ -13,7 +13,6 @@
             <attribute name="t-att-data-report-margin-top">data_report_margin_top if data_report_margin_top else None</attribute>
             <attribute name="t-att-data-report-header-spacing">data_report_header_spacing if data_report_header_spacing else None</attribute>
             <attribute name="t-att-data-report-dpi">data_report_dpi if data_report_dpi else None</attribute>
-            <attribute name="t-att-data-website-id">website.id if editable and website else None</attribute>
         </xpath>
         <!-- Add report style -->
         <xpath expr="//head" position="inside">