Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf7d8d74379a55ff917b5896627b20ec7c05c0c01 -r75f5cf4a8484f0c08b90edfb4b49a6268e51de65
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f7d8d74379a55ff917b5896627b20ec7c05c0c01)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 75f5cf4a8484f0c08b90edfb4b49a6268e51de65)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      13-Jun-2023
+* @author  (last)      Sean Nash
+* @date    (last)      22-Jun-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -1108,6 +1108,10 @@
         {
             result = requestDGStop();
         }
+        else if ( ( DG_MODE_STAN == dgMode ) && ( FALSE == startingTreatment.start ) )
+        {
+            result = signalAbortWaterSampling();
+        }
     }
 
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
@@ -1867,7 +1871,6 @@
 void sendROPermeateSampleDispenseReadyToHD( void )
 {
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
 
     // Create a message record
     blankMessage( &msg );