Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r3d413ac026e89a1324c4b0e99516735ec382fed8 -rd0c73712d9a955b8189e2d45b22f36af71806c03
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 3d413ac026e89a1324c4b0e99516735ec382fed8)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision d0c73712d9a955b8189e2d45b22f36af71806c03)
@@ -757,6 +757,7 @@
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgBicarbConductivity, BICARB_NORMAL_CONDUCTIVITY );  // trigger replace bottles alarm #1
+                clearAlarm( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );  // clear this alarm before triggering in case previous fill was bad and still active from before
                 activateAlarmNoData ( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );
             }
 
@@ -765,6 +766,7 @@
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgAcidConductivity, ACID_NORMAL_CONDUCTIVITY );  // trigger replace bottles alarm #1 then
+                clearAlarm( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );  // clear this alarm before triggering in case previous fill was bad and still active from before
                 activateAlarmNoData ( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );
             }
         }