diff --git a/addons/sale_product_configurator/static/src/js/product_configurator_controller.js b/addons/sale_product_configurator/static/src/js/product_configurator_controller.js
index 0fd8b042d6e..008e6e65fea 100644
--- a/addons/sale_product_configurator/static/src/js/product_configurator_controller.js
+++ b/addons/sale_product_configurator/static/src/js/product_configurator_controller.js
@@ -112,6 +112,8 @@ var ProductConfiguratorFormController = FormController.extend({
      */
     _configureProduct: function (productTemplateId) {
         var self = this;
+        var initialProduct = this.initialState.data.product_template_id;
+        var changed = initialProduct && initialProduct.data.id !== productTemplateId;
         var data = this.renderer.state.data;
         return this._rpc({
             route: '/sale_product_configurator/configure',
@@ -119,10 +121,10 @@ var ProductConfiguratorFormController = FormController.extend({
                 product_template_id: productTemplateId,
                 pricelist_id: this.renderer.pricelistId,
                 add_qty: data.quantity,
-                product_template_attribute_value_ids: this._getAttributeValueIds(
+                product_template_attribute_value_ids: changed ? [] : this._getAttributeValueIds(
                     data.product_template_attribute_value_ids
                 ),
-                product_no_variant_attribute_value_ids: this._getAttributeValueIds(
+                product_no_variant_attribute_value_ids: changed ? [] : this._getAttributeValueIds(
                     data.product_no_variant_attribute_value_ids
                 )
             }
diff --git a/addons/sale_product_configurator/wizard/sale_product_configurator_views.xml b/addons/sale_product_configurator/wizard/sale_product_configurator_views.xml
index 8286db9c0bb..ef094e76899 100644
--- a/addons/sale_product_configurator/wizard/sale_product_configurator_views.xml
+++ b/addons/sale_product_configurator/wizard/sale_product_configurator_views.xml
@@ -9,7 +9,7 @@
                     <field name="product_template_id" class="oe_product_configurator_product_template_id" />
                     <field name="product_template_attribute_value_ids" invisible="1" />
                     <field name="product_custom_attribute_value_ids" invisible="1" widget="one2many" >
-                        <tree>
+                        <tree limit="10000">
                             <field name="custom_product_template_attribute_value_id"/>
                             <field name="custom_value"/>
                         </tree>