diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py
index a730694537..106eb098c7 100755
--- a/cura/BuildVolume.py
+++ b/cura/BuildVolume.py
@@ -1118,7 +1118,9 @@ class BuildVolume(SceneNode):
 
     def _calculateMoveFromWallRadius(self, used_extruders):
         move_from_wall_radius = 0  # Moves that start from outer wall.
-        move_from_wall_radius = max(move_from_wall_radius, max(self._getSettingFromAllExtruders("infill_wipe_dist")))
+        all_values = [move_from_wall_radius]
+        all_values.extend(self._getSettingFromAllExtruders("infill_wipe_dist"))
+        move_from_wall_radius = max(all_values)
         avoid_enabled_per_extruder = [stack.getProperty("travel_avoid_other_parts", "value") for stack in used_extruders]
         travel_avoid_distance_per_extruder = [stack.getProperty("travel_avoid_distance", "value") for stack in used_extruders]
         for avoid_other_parts_enabled, avoid_distance in zip(avoid_enabled_per_extruder, travel_avoid_distance_per_extruder):  # For each extruder (or just global).
diff --git a/tests/TestBuildVolume.py b/tests/TestBuildVolume.py
index da130e3798..51a5f7e9e2 100644
--- a/tests/TestBuildVolume.py
+++ b/tests/TestBuildVolume.py
@@ -255,9 +255,10 @@ class TestGetEdgeDisallowedSize:
     def test_unknownAdhesion(self, build_volume: BuildVolume):
         build_volume._global_container_stack = self.createMockedStack()
         with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance"):
-            with pytest.raises(Exception):
+            #with pytest.raises(Exception):
                 # Since we don't have any adhesion set, this should break.
-                build_volume.getEdgeDisallowedSize()
+
+            build_volume.getEdgeDisallowedSize()
 
     def test_oneAtATime(self, build_volume: BuildVolume):
         build_volume._global_container_stack = self.createMockedStack()