Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -ra5a547f5decf862cfeb2c952a5bd267a3af3cf5b -r9fda0ba6fa4ca547e9c922765f95570c8d94df48
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision a5a547f5decf862cfeb2c952a5bd267a3af3cf5b)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9fda0ba6fa4ca547e9c922765f95570c8d94df48)
@@ -761,7 +761,15 @@
         }
         else if ( ( TRUE == syringeHome ) && ( TRUE == syringeStopped ) && ( FALSE == syringePreloaded ) )
         {
-            preloadSyringePlunger();
+            // Is syringe loaded?
+            if ( TRUE == isSyringeDetected() )
+            {
+                activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
+            }
+            else
+            {
+                preloadSyringePlunger();
+            }
         }
         else if ( TRUE == syringePreloaded )
         {