Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r6cb41faf89ea5500a378c2d845c1b9bb552b4b30 -r809d8fc395e63afc52a13fc30087d2cf50ad4d9a
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 6cb41faf89ea5500a378c2d845c1b9bb552b4b30)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 809d8fc395e63afc52a13fc30087d2cf50ad4d9a)
@@ -375,6 +375,9 @@
 {
     HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_WAIT_FOR_USER_START_STATE;
 
+    // Keep updating start time until the user requested priming
+    primeStartTime = getMSTimerCount();
+
 #ifndef SKIP_UI_INTERACTION
     if ( TRUE == primeStartRequested )
 #endif
@@ -622,9 +625,11 @@
         signalResumeSelfTests();
     }
 
+#ifndef SKIP_WET_SELF_TESTS
     execWetSelfTests();
 
     if ( TRUE == isWetSelfTestsPassed() )
+#endif
     {
         state = HD_PRIME_COMPLETE;
     }