diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 9ae5755a2f5..3cb129b2abc 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -89,12 +89,7 @@ class SaleOrder(models.Model):
         else:
             domain += [('product_custom_attribute_value_ids', '=', False)]
 
-        lines = self.env['sale.order.line'].sudo().search(domain)
-
-        if line_id:
-            return lines
-
-        return self.env['sale.order.line']
+        return self.env['sale.order.line'].sudo().search(domain)
 
     def _website_product_id_change(self, order_id, product_id, qty=0):
         order = self.sudo().browse(order_id)
diff --git a/addons/website_sale_product_configurator/models/sale_order.py b/addons/website_sale_product_configurator/models/sale_order.py
index 943fd23f22a..3d25c8f9769 100644
--- a/addons/website_sale_product_configurator/models/sale_order.py
+++ b/addons/website_sale_product_configurator/models/sale_order.py
@@ -9,7 +9,7 @@ class SaleOrder(models.Model):
 
     def _cart_find_product_line(self, product_id=None, line_id=None, **kwargs):
         lines = super(SaleOrder, self)._cart_find_product_line(product_id, line_id, **kwargs)
-        if lines:
+        if line_id:  # in this case we get the exact line we want, so filtering below would be wrong
             return lines
 
         linked_line_id = kwargs.get('linked_line_id', False)