Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r57f89f39a5236a2f12d3fed1f02f42482fb8ba00 -r6d1b4a804c109ee97310d70bdddff3e7d4330fa3
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 57f89f39a5236a2f12d3fed1f02f42482fb8ba00)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 6d1b4a804c109ee97310d70bdddff3e7d4330fa3)
@@ -404,7 +404,6 @@
                     accepted = TRUE;
                     heparinDeliveryState = HEPARIN_STATE_PAUSED;
                     stopSyringePump();
-                    sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, syringePumpSetRate, 0.0 );
                 }
                 else
                 {
@@ -417,7 +416,6 @@
                 {
                     accepted = TRUE;
                     startHeparinContinuous();
-                    sendTreatmentLogEventData( HEPARIN_START_RESUME_EVENT, HEPARIN_STATE_PAUSED, HEPARIN_STATE_DISPENSING );
                 }
                 else
                 {
@@ -524,7 +522,14 @@
     }
     if ( ( HEPARIN_STATE_INITIAL_BOLUS == heparinDeliveryState ) || ( HEPARIN_STATE_DISPENSING == heparinDeliveryState ) )
     {
-        sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, syringePumpSetRate, 0.0 );
+        if ( HEPARIN_STATE_INITIAL_BOLUS == heparinDeliveryState )
+        {
+            sendTreatmentLogEventData( HEPARIN_BOLUS_END_EVENT, syringePumpSetRate, 0.0 );
+        }
+        else
+        {
+            sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, syringePumpSetRate, 0.0 );
+        }
         heparinDeliveryState = HEPARIN_STATE_STOPPED;
     }
 }
@@ -1696,7 +1701,6 @@
     if ( TRUE == stopPump )
     {
         stopSyringePump();
-        sendTreatmentLogEventData( HEPARIN_BOLUS_END_EVENT, syringePumpSetRate, 0.0 );
         result = SYRINGE_PUMP_OFF_STATE;
     }