Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r4c5ab126c8c33f9a5dcc58cef8933bbe0b1c25b4 -rccd30f78626597083d05d343651b334b87b46e46
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4c5ab126c8c33f9a5dcc58cef8933bbe0b1c25b4)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision ccd30f78626597083d05d343651b334b87b46e46)
@@ -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 )
         {