diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 8e4b1933b..0659113d2 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -423,10 +423,12 @@ void SendCapabilities(void) {
     capabilities_t capabilities;
     capabilities.version = CAPABILITIES_VERSION;
     capabilities.via_fpc = reply_via_fpc;
+    
+    capabilities.baudrate = 0; // no real baudrate for USB-CDC
+#ifdef WITH_FPC_USART
     if (reply_via_fpc)
         capabilities.baudrate = usart_baudrate;
-    else
-        capabilities.baudrate = 0; // no real baudrate for USB-CDC
+#endif
 
 #ifdef WITH_FLASH
     capabilities.compiled_with_flash = true;
diff --git a/common/usart.h b/common/usart.h
index fd437c952..146e2e0d7 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -12,8 +12,6 @@ extern uint32_t usart_baudrate;
 extern uint8_t usart_parity;
 
 void usart_init(uint32_t baudrate, uint8_t parity);
-//void usart_close(void);
-
 int usart_writebuffer_sync(uint8_t *data, size_t len);
 uint32_t usart_read_ng(uint8_t *data, size_t len);
 uint16_t usart_rxdata_available(void);