Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r180454225e56637b264a3c018c8f283419a2e0d2 -r15f9827c863812cfd1f891d22342103fe9a72abc
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 180454225e56637b264a3c018c8f283419a2e0d2)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 15f9827c863812cfd1f891d22342103fe9a72abc)
@@ -153,15 +153,18 @@
             data[ msgSize++ ] = 0;
         }
 
-    #ifndef DISABLE_ACK_ERRORS
-        // If ACK required, add to pending ACK list
-        if ( TRUE == ackReq )
+    #ifndef DISABLE_ACK_ERRORS
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ACK_ERRORS ) != SW_CONFIG_ENABLE_VALUE )
         {
-            if ( FALSE == addMsgToPendingACKList( &msg, buffer, data, msgSize ) )
+            // If ACK required, add to pending ACK list
+            if ( TRUE == ackReq )
             {
-                error = TRUE;
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL )
-            }
+                if ( FALSE == addMsgToPendingACKList( &msg, buffer, data, msgSize ) )
+                {
+                    error = TRUE;
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL )
+                }
+            }
         }
     #endif