diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index ce165d1f3d..48321bae2f 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -6126,7 +6126,7 @@
                             "value": "raft_margin",
                             "default_value": 15,
                             "minimum_value_warning": "raft_interface_line_width",
-                            "maximum_value_warning": "20",
+                            "maximum_value_warning": "min(raft_interface_margin, 20)",
                             "enabled": "resolveOrValue('adhesion_type') == 'raft'",
                             "limit_to_extruder": "raft_base_extruder_nr",
                             "settable_per_mesh": false,
@@ -6141,7 +6141,7 @@
                             "value": "raft_margin",
                             "default_value": 15,
                             "minimum_value_warning": "raft_interface_line_width",
-                            "maximum_value_warning": "20",
+                            "maximum_value_warning": "min(raft_surface_margin, 20)",
                             "enabled": "resolveOrValue('adhesion_type') == 'raft'",
                             "limit_to_extruder": "raft_interface_extruder_nr",
                             "settable_per_mesh": false,