diff --git a/connectivity/FEATURE_BLE/source/common/ble_trace_helpers.h b/connectivity/FEATURE_BLE/source/common/ble_trace_helpers.h
index 82899c4dcf..b1eec07cad 100644
--- a/connectivity/FEATURE_BLE/source/common/ble_trace_helpers.h
+++ b/connectivity/FEATURE_BLE/source/common/ble_trace_helpers.h
@@ -56,10 +56,10 @@ static inline char* to_string(const UUID& uuid)
     static char string_buffer[Row_Count][UUID::LENGTH_OF_LONG_UUID + /* Number of hyphen delimiters =*/ 4];
     static uint8_t idx = 0;
 
+    ++idx;
+
     if (idx == Row_Count) {
         idx= 0;
-    } else {
-        idx++;
     }
 
     char* p1  = (char *)Buffer + Length - 1;