diff --git a/cura/Settings/SettingOverrideDecorator.py b/cura/Settings/SettingOverrideDecorator.py
index 1b5fb84f4a..e33109b723 100644
--- a/cura/Settings/SettingOverrideDecorator.py
+++ b/cura/Settings/SettingOverrideDecorator.py
@@ -104,7 +104,7 @@ class SettingOverrideDecorator(SceneNodeDecorator):
         """
 
         # for support_meshes, always use the support_extruder
-        if self.getStack().getProperty("support_mesh", "value"):
+        if self.getStack().userChanges.getProperty("support_mesh", "value"):
             global_container_stack = Application.getInstance().getGlobalContainerStack()
             if global_container_stack:
                 return str(global_container_stack.getProperty("support_extruder_nr", "value"))
diff --git a/plugins/SolidView/SolidView.py b/plugins/SolidView/SolidView.py
index dc88265d68..118160382e 100644
--- a/plugins/SolidView/SolidView.py
+++ b/plugins/SolidView/SolidView.py
@@ -198,11 +198,6 @@ class SolidView(View):
                         extruder_index = "0"
                     extruder_index = int(extruder_index)
 
-                    # Use the support extruder instead of the active extruder if this is a support_mesh
-                    if per_mesh_stack:
-                        if per_mesh_stack.getProperty("support_mesh", "value"):
-                            extruder_index = int(global_container_stack.getExtruderPositionValueWithDefault("support_extruder_nr"))
-
                     try:
                         material_color = self._extruders_model.getItem(extruder_index)["color"]
                     except KeyError: