diff --git a/client/cmdhw.c b/client/cmdhw.c
index 1cbba480a..1c2c77a55 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -491,14 +491,7 @@ void pm3_version(bool verbose) {
     PacketResponseNG resp;
     clearCommandBuffer();
     SendCommandOLD(CMD_VERSION, 0, 0, 0, NULL, 0);
-#ifdef USART_SLOW_LINK
-    // 10s timeout for slow FPC, e.g. over BT
-    // as this is the very first command sent to the pm3
-    // that initiates the BT connection
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 10000)) {
-#else
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
-#endif
         PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n");
         char s[60] = {0};
 #if defined(WITH_FLASH) || defined(WITH_SMARTCARD) || defined(WITH_FPC)
diff --git a/client/comms.c b/client/comms.c
index 4bcc2b7b8..7762a532b 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -568,7 +568,14 @@ int TestProxmark(void) {
     clearCommandBuffer();
     PacketResponseNG resp;
     SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 5000)) {
+#ifdef USART_SLOW_LINK
+    // 10s timeout for slow FPC, e.g. over BT
+    // as this is the very first command sent to the pm3
+    // that initiates the BT connection
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 10000)) {
+#else
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
+#endif
         conn.send_via_fpc = resp.oldarg[0] == 1;
         PrintAndLogEx(INFO, "Communicating with PM3 over %s.", conn.send_via_fpc ? _YELLOW_("FPC") : _YELLOW_("USB-CDC"));
         if (conn.send_via_fpc)