diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
index f1b9682c82..16f1e7cccd 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
@@ -23,7 +23,6 @@ RecommendedSettingSection
     function onEnableSectionChanged(state)
     {
         supportEnabled.setPropertyValue("value", state)
-        support.updateAllExtruders = true
     }
 
     property UM.SettingPropertyProvider supportEnabled: UM.SettingPropertyProvider
@@ -47,6 +46,7 @@ RecommendedSettingSection
                 id:support
                 width: parent.width
                 settingName: "support_structure"
+                propertyRemoveUnusedValue: false
             }
         },
         RecommendedSettingItem
diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml
index 4f516db751..fa150894f8 100644
--- a/resources/qml/Widgets/SingleSettingComboBox.qml
+++ b/resources/qml/Widgets/SingleSettingComboBox.qml
@@ -15,6 +15,7 @@ import Cura 1.7 as Cura
 Cura.ComboBox {
     textRole: "text"
     property alias settingName: propertyProvider.key
+    property alias propertyRemoveUnusedValue: propertyProvider.removeUnusedValue
 
     // If true, all extruders will have "settingName" property updated.
     // The displayed value will be read from the extruder with index "defaultExtruderIndex" instead of the machine.
@@ -89,9 +90,7 @@ Cura.ComboBox {
     }
     function forceUpdateSettings()
     {
-        updateAllExtruders = false
         comboboxModel.updateModel();
-        propertyProvider.setPropertyValueForce("value", comboboxModel.get(currentIndex).code)
     }
 
     function updateSetting(value)
@@ -102,7 +101,7 @@ Cura.ComboBox {
         }
         else
         {
-            propertyProvider.setPropertyValueForce("value", value)
+            propertyProvider.setPropertyValue("value", value)
         }
     }
 }