Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r33cfd359dafaa7fae556cb57a820543f9c1f4cfc -r8acad167bcf7ad07043192007e59d253a5216e3a
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 33cfd359dafaa7fae556cb57a820543f9c1f4cfc)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 8acad167bcf7ad07043192007e59d253a5216e3a)
@@ -207,8 +207,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;
     }
 
@@ -361,9 +360,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;