diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index 9a3a84a9adb..35ce4cdd6a9 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -158,10 +158,11 @@ class view(osv.osv):
                 qcontext.update(values)
 
             # in edit mode ir.ui.view will tag nodes
-            if qcontext.get('editable'):
-                context = dict(context, inherit_branding=True)
-            elif request.registry['res.users'].has_group(cr, uid, 'base.group_website_publisher'):
-                context = dict(context, inherit_branding_auto=True)
+            if not qcontext.get('rendering_bundle'):
+                if qcontext.get('editable'):
+                    context = dict(context, inherit_branding=True)
+                elif request.registry['res.users'].has_group(cr, uid, 'base.group_website_publisher'):
+                    context = dict(context, inherit_branding_auto=True)
 
             view_obj = request.website.get_template(id_or_xml_id)
             if 'main_object' not in qcontext:
diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index c183a013430..dd043a32a0c 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -1091,6 +1091,7 @@ class AssetsBundle(object):
 
         context = self.context.copy()
         context['inherit_branding'] = False
+        context['inherit_branding_auto'] = False
         context['rendering_bundle'] = True
         self.html = self.registry['ir.ui.view'].render(self.cr, self.uid, xmlid, context=context)
         self.parse()