diff --git a/addons/sale_product_configurator/controllers/main.py b/addons/sale_product_configurator/controllers/main.py
index bf1c098e481..f5d4d8ad175 100644
--- a/addons/sale_product_configurator/controllers/main.py
+++ b/addons/sale_product_configurator/controllers/main.py
@@ -42,9 +42,10 @@ class ProductConfiguratorController(Controller):
             request.update_context(allowed_company_ids=[company_id])
         product_template = request.env['product.template'].browse(product_template_id)
 
+        combination = request.env['product.template.attribute.value']
         if ptav_ids:
-            combination = request.env['product.template.attribute.value'].browse(ptav_ids)
-        else:
+            combination = request.env['product.template.attribute.value'].browse(ptav_ids).filtered(lambda ptav: ptav.product_tmpl_id.id == product_template_id)
+        if not combination:
             combination = product_template._get_first_possible_combination()
 
         return dict(