Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rceccf84de0d3518691abcf0ed94389777c6fd055 -re23b440e0a076a9e76edd057a98d1b16270129bc
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ceccf84de0d3518691abcf0ed94389777c6fd055)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e23b440e0a076a9e76edd057a98d1b16270129bc)
@@ -760,16 +760,11 @@
         {
             result = TRUE;
             // Remove message pending ACK from list
-            if ( 0 == ( getU32OverrideValue( &pendingACKOverride ) )
+            if ( ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_UI_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_HD_2_UI ) ) &&
+                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DG_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_HD_2_DG ) ) )
             {
                 pendingAckList[ i ].used = FALSE;
-
             }
-            if ( ( ( getU32OverrideValue( &pendingACKOverride ) == PENDING_ACK_LIST_OVERRIDE_UI_CHANNEL ) && ( pendingAckList[ i ].channel == COMM_BUFFER_OUT_CAN_HD_2_UI ) ) ||
-                 ( ( getU32OverrideValue( &pendingACKOverride ) == PENDING_ACK_LIST_OVERRIDE_DG_CHANNEL ) && ( pendingAckList[ i ].channel == COMM_BUFFER_OUT_CAN_HD_2_DG ) ) )
-            {
-            }
-
             break;
         }
     }