diff --git a/ARM.CMSIS-Driver_Validation.pdsc b/ARM.CMSIS-Driver_Validation.pdsc
index 8203bc2..62ac9b9 100644
--- a/ARM.CMSIS-Driver_Validation.pdsc
+++ b/ARM.CMSIS-Driver_Validation.pdsc
@@ -10,6 +10,7 @@
   <releases>
     <release version="3.1.1-dev">
       Active Development ...
+      - Fix USART Server application buffer initialization
     </release>
   </releases>
 
diff --git a/Tools/USART_Server/STM32F429I-DISC1/Include/USART_Server.h b/Tools/USART_Server/STM32F429I-DISC1/Include/USART_Server.h
index d6f0b13..78f56c8 100644
--- a/Tools/USART_Server/STM32F429I-DISC1/Include/USART_Server.h
+++ b/Tools/USART_Server/STM32F429I-DISC1/Include/USART_Server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022 Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2026 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 
-#define USART_SERVER_VER               "1.0.1"
+#define USART_SERVER_VER               "1.0.2"
 
 #define USART_SERVER_STATE_RECEPTION    0
 #define USART_SERVER_STATE_EXECUTION    1
diff --git a/Tools/USART_Server/STM32F429I-DISC1/Source/USART_Server.c b/Tools/USART_Server/STM32F429I-DISC1/Source/USART_Server.c
index a8df7f8..926bc76 100644
--- a/Tools/USART_Server/STM32F429I-DISC1/Source/USART_Server.c
+++ b/Tools/USART_Server/STM32F429I-DISC1/Source/USART_Server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022 Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2026 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -262,9 +262,9 @@ int32_t USART_Server_Start (void) {
     ptr_usart_xfer_buf_tx = (uint8_t *)ptr_usart_xfer_buf_tx_alloc;
   }
 
-  if ((ptr_usart_xfer_buf_rx != NULL) || (ptr_usart_xfer_buf_tx != NULL)) {
-    memset(ptr_usart_xfer_buf_rx, 0, USART_SERVER_BUF_SIZE);
+  if ((ptr_usart_xfer_buf_rx != NULL) && (ptr_usart_xfer_buf_tx != NULL)) {
     memset(ptr_usart_xfer_buf_rx, 0, USART_SERVER_BUF_SIZE);
+    memset(ptr_usart_xfer_buf_tx, 0, USART_SERVER_BUF_SIZE);
     ret = EXIT_SUCCESS;
   } else {
     ret = EXIT_FAILURE;
diff --git a/Tools/USART_Server/Template/Source/USART_Server.c b/Tools/USART_Server/Template/Source/USART_Server.c
index 0b1c644..ca4438f 100644
--- a/Tools/USART_Server/Template/Source/USART_Server.c
+++ b/Tools/USART_Server/Template/Source/USART_Server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022 Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2026 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *