Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r46dc6530881c0d2a8dc46a6fceb2be43f5d7ca27 -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 46dc6530881c0d2a8dc46a6fceb2be43f5d7ca27)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    SystemCommMessages.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      09-Oct-2023
+* @date    (last)      20-Oct-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -3436,7 +3436,8 @@
     U32 totalMessages;
     U32 payloadLength;
 
-    if ( message->hdr.payloadLen >= ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(payloadLength) ) )
+    if ( ( message->hdr.payloadLen >= ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(payloadLength) ) ) &&
+         ( DG_MODE_SERV == getCurrentOperationMode() ) )
     {
         memcpy(&currentMessage, payloadPtr, sizeof(U32));
         payloadPtr += sizeof(U32);
@@ -3498,7 +3499,8 @@
     U32 totalMessages;
     U32 payloadLength;
 
-    if ( message->hdr.payloadLen >= ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(payloadLength) ) )
+    if ( ( message->hdr.payloadLen >= ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(payloadLength) ) ) &&
+         ( DG_MODE_SERV == getCurrentOperationMode() ) )
     {
         memcpy(&currentMessage, payloadPtr, sizeof(U32));
         payloadPtr += sizeof(U32);
@@ -3587,7 +3589,8 @@
     U32 totalMessages;
     U32 payloadLength;
 
-    if ( message->hdr.payloadLen >= ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(payloadLength) ) )
+    if ( ( message->hdr.payloadLen >= ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(payloadLength) ) ) &&
+         ( DG_MODE_SERV == getCurrentOperationMode() ) )
     {
         memcpy(&currentMessage, payloadPtr, sizeof(U32));
         payloadPtr += sizeof(U32);