diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 63a519a2a8c..3f2431a013a 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -677,6 +677,9 @@ class website_sale(http.Controller):
 
         self.checkout_form_save(values["checkout"])
 
+        if not int(post.get('shipping_id', 0)):
+            order.partner_shipping_id = order.partner_invoice_id
+
         request.session['sale_last_order_id'] = order.id
 
         request.website.sale_get_order(update_pricelist=True, context=context)