diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 3411fb3e3b9..88a8bb27fa5 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -605,9 +605,12 @@ class WebsiteSale(ProductConfiguratorController):
         new_values['customer'] = True
         new_values['team_id'] = request.website.salesteam_id and request.website.salesteam_id.id
         new_values['user_id'] = request.website.salesperson_id and request.website.salesperson_id.id
-        new_values['company_id'] = request.website.company_id.id
         new_values['website_id'] = request.website.id
 
+        if order.partner_id.id == request.website.user_id.sudo().partner_id.id:
+            # If the partner is public, we assign the company of the website
+            new_values['company_id'] = request.website.company_id.id
+
         lang = request.lang if request.lang in request.website.mapped('language_ids.code') else None
         if lang:
             new_values['lang'] = lang