Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r59b7b1cd099ab5a5e943fb5307aec264cbadb51a -reca8d3222a8fbcda268c8ea1c004dfe0a7ed30db
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 59b7b1cd099ab5a5e943fb5307aec264cbadb51a)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision eca8d3222a8fbcda268c8ea1c004dfe0a7ed30db)
@@ -941,6 +941,14 @@
             }
         }
 
+        if ( TRUE == getEmpytBottleDetectedFlag() )
+        {
+            // If the alarm was triggered due to the empty bottle alarm, clear the alarm since we are at the end of the fill
+            // Set the empty bottle flag to false since we are done
+            clearAlarm( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
+            setEmptyBottleDetectedFlag( FALSE );
+        }
+
         // SRSDG 400
         if ( ( FALSE == isValueWithinPercentRange( avgBicarbConduSPerCM, bicarbNormalConduSPerCM, FIVE_PERCENT_FACTOR ) ) &&
              ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML ) && ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )