Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r345a9b1694f4b0a9c9d3e9be45ee2e1f113dc942 -r37a576d648872455727fee75fe883890b185f370
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 345a9b1694f4b0a9c9d3e9be45ee2e1f113dc942)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 37a576d648872455727fee75fe883890b185f370)
@@ -1322,12 +1322,15 @@
             case DD_GEND_STATE_START:
             case DD_GEND_DIALYSATE_BYPASS_STATE:
             case DD_GEND_DIALYSATE_DELIVERY_STATE:
-            case DD_GEND_ISOLATED_UF_STATE:
             case DD_GEND_SPENT_CHAMBER_FILL_STATE:
+                result = TRUE;
+                break;
+
+            case DD_GEND_ISOLATED_UF_STATE:
             case DD_GEND_BICARB_CHAMBER_FILL_STATE:
             case DD_GEND_DIALYSATE_DELIVERY_PAUSE:
             default:
-                result = TRUE;
+                result = FALSE;
                 break;
         }
     }
@@ -1354,11 +1357,22 @@
         {
             // TODO add logic after checking with Vinay
             // Any of these state require no special handling
-            case DD_GEND_STATE_START:
+
             case DD_GEND_DIALYSATE_BYPASS_STATE:
+                isDialDeliveryInProgress.data = FALSE;
+                break;
+
             case DD_GEND_DIALYSATE_DELIVERY_STATE:
-            case DD_GEND_ISOLATED_UF_STATE:
+                isDialDeliveryInProgress.data = TRUE;
+                break;
+
             case DD_GEND_SPENT_CHAMBER_FILL_STATE:
+                pendingSpentChamberFill = FALSE;
+                isDialDeliveryInProgress.data = FALSE;
+                break;
+
+            case DD_GEND_STATE_START:
+            case DD_GEND_ISOLATED_UF_STATE:
             case DD_GEND_BICARB_CHAMBER_FILL_STATE:
             case DD_GEND_DIALYSATE_DELIVERY_PAUSE:
             default: