diff --git a/client/proxmark3.c b/client/proxmark3.c
index c4000bd84..f0239f81c 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -27,6 +27,7 @@
 #include "cmdhw.h"
 #include "whereami.h"
 #include "comms.h"
+#include "usart.h"
 
 static void showBanner(void) {
     printf("\n\n");
@@ -422,8 +423,9 @@ int main(int argc, char *argv[]) {
 
     // default speed for USB 460800,  USART(FPC serial) 115200 baud
     if (speed == 0)
-#ifdef WITH_FPC
-        speed = 115200;
+#ifdef WITH_FPC_HOST
+        // Let's assume we're talking by default to pm3 over usart in this mode
+        speed = AT91_BAUD_RATE;
 #else
         speed = 460800;
 #endif
diff --git a/common/usart.c b/common/usart.c
index f0a58131b..1695995a2 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -180,7 +180,7 @@ void usart_init(void) {
     // all interrupts disabled
     pUS1->US_IDR = 0xFFFF;
 
-    pUS1->US_BRGR =  48054841 / (115200 << 3);
+    pUS1->US_BRGR =  48054841 / (AT91_BAUD_RATE << 3);
     // Need speed?
     //pUS1->US_BRGR =  48054841 / (460800 << 3);