Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1aeab08c1baf6445514b81fe51fc60a3e536e782 -r6bb7cd715299d16c131ab074fac0e62d8022f235
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1aeab08c1baf6445514b81fe51fc60a3e536e782)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6bb7cd715299d16c131ab074fac0e62d8022f235)
@@ -1702,12 +1702,13 @@
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( 0 == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetSafetyShutdownOverride( payload.state.u32 );
+            U32 command = 1;
+            result = testSetSafetyShutdownOverride( command );
         }
         else
         {