Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r4638fd77792d0c7ecbeca3c84369cbed6c2ecee1 -r5e99007b56b14a0656fabb7145fe86ac17900f93
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4638fd77792d0c7ecbeca3c84369cbed6c2ecee1)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5e99007b56b14a0656fabb7145fe86ac17900f93)
@@ -1901,18 +1901,17 @@
     if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
-        if ( payload.index < NUM_OF_UV_REACTORS )
+
+        // Set turn on/off command
+        switch ( payload.state.u32 )
         {
-            switch ( payload.state.u32 )
-            {
-                case TURN_OFF:
-                    result = turnOffUVReactor( (UV_REACTORS_T)payload.index );
-                    break;
+            case TURN_OFF:
+                result = turnOffUVReactor( (UV_REACTORS_T)payload.index );
+                break;
 
-                case TURN_ON:
-                    result = turnOnUVReactor( (UV_REACTORS_T)payload.index );
-                    break;
-            }
+            case TURN_ON:
+                result = turnOnUVReactor( (UV_REACTORS_T)payload.index );
+                break;
         }
     }