diff --git a/app/AvrdudeUploader.java b/app/AvrdudeUploader.java
index e93843266..27b1c2b91 100755
--- a/app/AvrdudeUploader.java
+++ b/app/AvrdudeUploader.java
@@ -63,7 +63,10 @@ public class AvrdudeUploader extends Uploader  {
     commandDownloader.add("-D"); // don't erase
     commandDownloader.add("-Uflash:w:" + buildPath + File.separator + className + ".hex:i");
 
-    flushSerialBuffer();
+    if (Preferences.get("boards." + Preferences.get("board") + ".upload.disable_flushing") == null ||
+        Preferences.getBoolean("boards." + Preferences.get("board") + ".upload.disable_flushing") == false) {
+      flushSerialBuffer();
+    }
 
     return avrdude(commandDownloader);
   }
diff --git a/hardware/boards.txt b/hardware/boards.txt
index 338aa63c6..8fcf066c6 100644
--- a/hardware/boards.txt
+++ b/hardware/boards.txt
@@ -64,6 +64,7 @@ bt.name=Arduino BT
 bt.upload.protocol=stk500
 bt.upload.maximum_size=14336
 bt.upload.speed=19200
+bt.upload.disable_flushing=true
 
 bt.bootloader.low_fuses=0xff
 bt.bootloader.high_fuses=0xdd