diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 4ece303dc..52f57a05d 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -74,11 +74,11 @@ struct timeval timeout = {
 };
 
 uint32_t newtimeout_value = 0;
-bool newtimeout_nopending = true;
+bool newtimeout_pending = false;
 
 int uart_reconfigure_timeouts(uint32_t value) {
     newtimeout_value = value;
-    __atomic_clear(&newtimeout_nopending, __ATOMIC_SEQ_CST);
+    __atomic_test_and_set(&newtimeout_pending, __ATOMIC_SEQ_CST);
     return PM3_SUCCESS;
 }
 
@@ -302,7 +302,9 @@ int uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len) {
     uint32_t pos = 0;
     fd_set rfds;
     struct timeval tv;
-    if (__atomic_test_and_set(&newtimeout_nopending, __ATOMIC_SEQ_CST) == 0)
+    
+    bool shall_update = __atomic_load_n(&newtimeout_pending, __ATOMIC_SEQ_CST);
+    if ( shall_update )
         timeout.tv_usec = newtimeout_value * 1000;
 
     while (pos < len) {
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index a514f8148..4f9515dcb 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -49,16 +49,17 @@ typedef struct {
 } serial_port_windows;
 
 uint32_t newtimeout_value = 0;
-bool newtimeout_nopending = true;
+bool newtimeout_pending = true;
 
 int uart_reconfigure_timeouts(uint32_t value) {
     newtimeout_value = value;
-    __atomic_clear(&newtimeout_nopending, __ATOMIC_SEQ_CST);
+    __atomic_test_and_set(&newtimeout_pending, __ATOMIC_SEQ_CST);    
     return PM3_SUCCESS;
 }
 
 static int uart_reconfigure_timeouts_polling(serial_port sp) {
-    if (__atomic_test_and_set(&newtimeout_nopending, __ATOMIC_SEQ_CST) != 0)
+    bool shall_update = __atomic_load_n(&newtimeout_pending, __ATOMIC_SEQ_CST);
+    if ( shall_update == false )
         return PM3_SUCCESS;
 
     serial_port_windows *spw;