diff --git a/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py b/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py
index 4c1ec2f247..35861c9486 100644
--- a/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py
+++ b/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py
@@ -7,7 +7,8 @@ from UM.VersionUpgrade import VersionUpgrade
 # are overwritten, the key wins. If only the key or the value is overwritten,
 # that value is used in the key.
 _merged_settings = {
-    "machine_head_with_fans_polygon": "machine_head_polygon"
+    "machine_head_with_fans_polygon": "machine_head_polygon",
+    "support_wall_count": "support_tree_wall_count"
 }
 
 class VersionUpgrade44to45(VersionUpgrade):
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 2c24fb6271..117ee0e5ad 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -4232,7 +4232,7 @@
                     "minimum_value_warning": "1 if support_pattern == 'concentric' else 0",
                     "maximum_value_warning": "3",
                     "type": "int",
-                    "value": "1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0",
+                    "value": "1 if support_tree_enable else (1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0)",
                     "enabled": "support_enable",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,
@@ -6198,24 +6198,7 @@
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "enabled": "support_tree_enable",
                     "settable_per_mesh": false,
-                    "settable_per_extruder": true,
-                    "children":
-                    {
-                        "support_tree_wall_count":
-                        {
-                            "label": "Tree Support Wall Line Count",
-                            "description": "The number of walls of the branches of tree support. Thicker walls take longer to print but don't fall over as easily.",
-                            "type": "int",
-                            "minimum_value": "0",
-                            "minimum_value_warning": "1",
-                            "default_value": 1,
-                            "value": "round(support_tree_wall_thickness / support_line_width)",
-                            "limit_to_extruder": "support_infill_extruder_nr",
-                            "enabled": "support_tree_enable",
-                            "settable_per_mesh": false,
-                            "settable_per_extruder": true
-                        }
-                    }
+                    "settable_per_extruder": true
                 },
                 "slicing_tolerance":
                 {