Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r721bd715bef050760e5c0f79044d1cba642c8354 -rbdb9a1b636579c7bcfe95b329aa7e41ce161db13
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 721bd715bef050760e5c0f79044d1cba642c8354)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision bdb9a1b636579c7bcfe95b329aa7e41ce161db13)
@@ -8,7 +8,7 @@
 * @file    ModeFill.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      28-Oct-2024
+* @date    (last)      27-Feb-2025
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  19-Nov-2019
@@ -626,6 +626,12 @@
         if ( TRUE == isThisTheFirstFill() )
         {
             result = DG_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES;
+
+            if ( TRUE == getTestConfigStatus( TEST_CONFIG_EXPEDITE_PRE_TREATMENT ) )
+            {
+                // If expedite pre-treatment flag is enabled, do not do the initial fill
+                result = DG_FILL_MODE_STATE_PRODUCE_DIALYSATE;
+            }
         }
         else
         {