Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -re5d1d67106a93a6cd1b5692b586625d715732e2f
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision e5d1d67106a93a6cd1b5692b586625d715732e2f)
@@ -206,8 +206,7 @@
             break;
 
         default:
-            currentPrimeState = HD_PRIME_START_STATE;
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_PRE_TREATMENT_PRIME_INVALID_STATE, (U32)currentReservoirMgmtState );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_PRE_TREATMENT_PRIME_INVALID_STATE, currentReservoirMgmtState );
             break;
     }
 
@@ -360,9 +359,10 @@
     // Keep updating start time until the user requested priming
     primeStartTime = getMSTimerCount();
 
-#ifndef SKIP_UI_INTERACTION
-    if ( TRUE == primeStartRequested )
+#ifdef SKIP_UI_INTERACTION
+    primeStartRequested = TRUE;
 #endif
+    if ( TRUE == primeStartRequested )
     {
         primeStartRequested = FALSE;
         state = HD_PRIME_SALINE_SETUP_STATE;