Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -ra6e1a62344275a14e4edde1bdda9974eef840827 -r71e2ca2cd5cc70a6b9c0c258b1445c57f1445fca
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a6e1a62344275a14e4edde1bdda9974eef840827)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 71e2ca2cd5cc70a6b9c0c258b1445c57f1445fca)
@@ -1700,12 +1700,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
         {