Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r3f4105248e6c49ab487ec065f9a4843d72a16a2a -r30a1fca8ec00c5190bb829040159c0572f3879b7
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 3f4105248e6c49ab487ec065f9a4843d72a16a2a)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 30a1fca8ec00c5190bb829040159c0572f3879b7)
@@ -913,7 +913,12 @@
 {
     dgCmdResp[ DG_CMD_START_FILL ].commandID = DG_CMD_NONE;
 
-    sendDGFillCommand( DG_CMD_START, fillToVolMl, targetFlowLPM );
+    if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) && ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) )
+    {
+        // The empty bottle alarms should not be active. If they are, the user shall insert the new bottle first and then hit Ok/Resume and
+        // then the fill can go. This is to make sure the next fill is done the full bottles
+        sendDGFillCommand( DG_CMD_START, fillToVolMl, targetFlowLPM );
+    }
 }
 
 /*********************************************************************//**