diff --git a/RNode_Firmware.ino b/RNode_Firmware.ino
index 22f841f..c6b1327 100644
--- a/RNode_Firmware.ino
+++ b/RNode_Firmware.ino
@@ -68,7 +68,13 @@ void setup() {
   fifo_init(&serialFIFO, serialBuffer, CONFIG_UART_BUFFER_SIZE);
 
   Serial.begin(serial_baudrate);
+  #if BOARD_MODEL != BOARD_RAK4630
+  // Some boards need to wait until the hardware UART is set up before booting
+  // the full firmware. In the case of the RAK4630, the line below will wait
+  // until a serial connection is actually established with a master. Thus, it
+  // is disabled on this platform.
   while (!Serial);
+  #endif
 
   serial_interrupt_init();