Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r557f409455dde035899c9f89a8b93f57e8eb7f2b -ref46e2aa7eba74dabd99bfcd9e6b38b8ce77820c
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 557f409455dde035899c9f89a8b93f57e8eb7f2b)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision ef46e2aa7eba74dabd99bfcd9e6b38b8ce77820c)
@@ -250,13 +250,18 @@
             if ( TRUE == isEmptyAcidBottle() )
             {
                 activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );    // trigger empty acid bottle alarm
+                setBottlesNeedPrimeFlag( TRUE );
             }
             else if ( TRUE == isEmptyBicarbBottle() )
             {
+                setBottlesNeedPrimeFlag( TRUE );
                 activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );  // trigger empty bicarb bottle alarm
             }
-
-            requestNewOperationMode( DG_MODE_GENE );
+            else if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) ||
+                      ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) )
+            {
+                requestNewOperationMode( DG_MODE_GENE );
+            }
         }
     }