Index: firmware/App/Controllers/DialysateFlow.c
===================================================================
diff -u -r24e6e4df038de04e13363d1eb929b4fd693046ff -r9cf99616cedc2bdf73b1af4dbbb43ee1cf3ef06b
--- firmware/App/Controllers/DialysateFlow.c	(.../DialysateFlow.c)	(revision 24e6e4df038de04e13363d1eb929b4fd693046ff)
+++ firmware/App/Controllers/DialysateFlow.c	(.../DialysateFlow.c)	(revision 9cf99616cedc2bdf73b1af4dbbb43ee1cf3ef06b)
@@ -109,6 +109,7 @@
 void execDialysateFlowMeterMonitor( void )
 {
     U16 dialysateFlowReading = getFPGADialysateFlowRate();
+    dialysateFlowReading     = ( 0 == dialysateFlowReading ? FLOW_SENSOR_ZERO_READING : dialysateFlowReading );
     F32 currentFlow;
     BOOL isFlowOutOfUpperRange;
 
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r22176ce95e49213c48454f34ddf5d29b8109f2cb -r9cf99616cedc2bdf73b1af4dbbb43ee1cf3ef06b
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 22176ce95e49213c48454f34ddf5d29b8109f2cb)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 9cf99616cedc2bdf73b1af4dbbb43ee1cf3ef06b)
@@ -65,7 +65,7 @@
         /* SERV     */{ DG_MODE_FAUL, DG_MODE_SERV, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
         /* INIT     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_INIT, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
         /* STAN     */{ DG_MODE_FAUL, DG_MODE_SERV, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_GENE, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_HEAT, DG_MODE_CHEM },
-        /* SOLO     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_HEAT, DG_MODE_CHEM /*DG_MODE_NLEG*/ }, // TODO for testing only
+        /* SOLO     */{ DG_MODE_FAUL, DG_MODE_SERV, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_HEAT, DG_MODE_CHEM /*DG_MODE_NLEG*/ }, // TODO for testing only
         /* GENE     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_GENE, DG_MODE_FILL, DG_MODE_DRAI, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
         /* FILL     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_GENE, DG_MODE_FILL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
         /* DRAI     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_GENE, DG_MODE_NLEG, DG_MODE_DRAI, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },