diff --git a/resources/web/flush/WipingDialog.html b/resources/web/flush/WipingDialog.html
index efaea1c8ea..249ee03449 100644
--- a/resources/web/flush/WipingDialog.html
+++ b/resources/web/flush/WipingDialog.html
@@ -432,10 +432,11 @@
         return (0.299 * r + 0.587 * g + 0.114 * b) / 255;
       }
 
-
       function updateVolumeRange(min_volume,max_volume){
+        // Orca: "Typical" guidance only unlinked from upper bound in the slicer.
+        const TYPICAL_MAX_FLUSH_VOLUME = 900;
         const panel = document.getElementById('volume_range_panel');
-        panel.innerText = panel.innerText.replace(/\[.*\]/, `[${min_volume}, ${max_volume}]`);
+        panel.innerText = panel.innerText.replace(/\[.*\]/, `[${min_volume}, ${TYPICAL_MAX_FLUSH_VOLUME}]`);
       }
 
       function updateMultiplierRange(min_multiplier,max_multiplier){
diff --git a/src/libslic3r/FlushVolCalc.cpp b/src/libslic3r/FlushVolCalc.cpp
index 675732d767..9bdbc1737d 100644
--- a/src/libslic3r/FlushVolCalc.cpp
+++ b/src/libslic3r/FlushVolCalc.cpp
@@ -10,7 +10,8 @@ namespace Slic3r {
 const int g_min_flush_volume_from_support = 700;
 const int g_flush_volume_to_support = 230;
 
-const int g_max_flush_volume = 900;
+const int g_max_flush_volume = 20000; //Orca: increase limit to 20k vs 900 in upstream BBS code.
+                                      // Retain a clamp to guard against extreme values entered in the UI
 
 static float to_radians(float degree)
 {