Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r1f0d779958e23f9617cfec07879a49961c858223 -r50bd9a2421e5b7bb6a94a13cf54eb469aac7d574
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 1f0d779958e23f9617cfec07879a49961c858223)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 50bd9a2421e5b7bb6a94a13cf54eb469aac7d574)
@@ -525,6 +525,10 @@
         syringePumpSetRate = SYRINGE_PUMP_SEEK_RATE;
         syringePumpSeekRequested = TRUE;
     }
+    if ( MODE_SERV == getCurrentOperationMode() )       // Allow syringe pump operations in Service Mode.
+    {
+        heparinDeliveryState = HEPARIN_STATE_STOPPED;
+    }
 
     return syringePumpSeekRequested;
 }
@@ -546,6 +550,10 @@
         syringePumpPrimeRequested = TRUE;
         resetHeparinVolumeDelivered();
     }
+    if ( MODE_SERV == getCurrentOperationMode() )       // Allow syringe pump operations in Service Mode.
+    {
+        heparinDeliveryState = HEPARIN_STATE_STOPPED;
+    }
 
     return syringePumpPrimeRequested;
 }
@@ -592,8 +600,13 @@
         {
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_BOLUS_CMD, syringePumpSetRate )
         }
+        if ( MODE_SERV == getCurrentOperationMode() )       // Allow syringe pump operations in Service Mode.
+        {
+            heparinDeliveryState = HEPARIN_STATE_STOPPED;
+        }
     }
 
+
     return syringePumpBolusRequested;
 }
 
@@ -625,6 +638,10 @@
         {
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_CONT_CMD, flowRate )
         }
+        if ( MODE_SERV == getCurrentOperationMode() )       // Allow syringe pump operations in Service Mode.
+        {
+            heparinDeliveryState = HEPARIN_STATE_STOPPED;
+        }
     }
 
     return syringePumpContinuousRequested;