diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 96c7de0ea1..68bab9a63a 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -5608,9 +5608,9 @@
                 {
                     "label": "Build Plate Adhesion Extruder",
                     "description": "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.",
-                    "type": "extruder",
-                    "default_value": "0",
-                    "value": "int(defaultExtruderPosition())",
+                    "type": "optional_extruder",
+                    "default_value": "-1",
+                    "value": "int(defaultExtruderPosition()) if resolveOrValue('adhesion_type') == 'raft' else -1",
                     "enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') != 'none' or resolveOrValue('prime_tower_brim_enable'))",
                     "resolve": "max(extruderValues('adhesion_extruder_nr'))",
                     "settable_per_mesh": false,
@@ -5623,8 +5623,9 @@
                             "description": "The extruder train to use for printing the skirt or brim. This is used in multi-extrusion.",
                             "type": "optional_extruder",
                             "default_value": "-1",
-                            "enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') == 'skirt' or resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable'))",
-                            "resolve": "'-1' if '-1' in extruderValues('skirt_brim_extruder_nr') else adhesion_extruder_nr",
+                            "value": "adhesion_extruder_nr",
+                            "enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') in ['skirt', 'brim'] or resolveOrValue('prime_tower_brim_enable'))",
+                            "resolve": "max(extruderValues('skirt_brim_extruder_nr'))",
                             "settable_per_mesh": false,
                             "settable_per_extruder": false
                         },
@@ -5634,7 +5635,7 @@
                             "description": "The extruder train to use for printing the first layer of the raft. This is used in multi-extrusion.",
                             "type": "extruder",
                             "default_value": "0",
-                            "value": "adhesion_extruder_nr",
+                            "value": "0 if adhesion_extruder_nr == -1 else adhesion_extruder_nr",
                             "enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'",
                             "resolve": "max(extruderValues('raft_base_extruder_nr'))",
                             "settable_per_mesh": false,
@@ -5646,7 +5647,7 @@
                             "description": "The extruder train to use for printing the middle layer of the raft. This is used in multi-extrusion.",
                             "type": "extruder",
                             "default_value": "0",
-                            "value": "adhesion_extruder_nr",
+                            "value": "0 if adhesion_extruder_nr == -1 else adhesion_extruder_nr",
                             "enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'",
                             "resolve": "max(extruderValues('raft_interface_extruder_nr'))",
                             "settable_per_mesh": false,
@@ -5658,7 +5659,7 @@
                             "description": "The extruder train to use for printing the top layer(s) of the raft. This is used in multi-extrusion.",
                             "type": "extruder",
                             "default_value": "0",
-                            "value": "adhesion_extruder_nr",
+                            "value": "0 if adhesion_extruder_nr == -1 else adhesion_extruder_nr",
                             "enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'",
                             "resolve": "max(extruderValues('raft_surface_extruder_nr'))",
                             "settable_per_mesh": false,