diff --git a/app/src/processing/app/AbstractMonitor.java b/app/src/processing/app/AbstractMonitor.java
index 027601c5780..ec316650f22 100644
--- a/app/src/processing/app/AbstractMonitor.java
+++ b/app/src/processing/app/AbstractMonitor.java
@@ -111,7 +111,7 @@ public void actionPerformed(ActionEvent event) {
 
     String[] serialRateStrings = {
             "300", "1200", "2400", "4800", "9600",
-            "19200", "57600", "115200"
+            "19200", "38400", "57600", "115200"
     };
 
     serialRates = new JComboBox();
diff --git a/arduino-core/src/processing/app/PreferencesData.java b/arduino-core/src/processing/app/PreferencesData.java
index c75e6f7b568..94cc187c82c 100644
--- a/arduino-core/src/processing/app/PreferencesData.java
+++ b/arduino-core/src/processing/app/PreferencesData.java
@@ -80,7 +80,7 @@ static public void init(File file) {
 
   private static void fixPreferences() {
     String baud = get("serial.debug_rate");
-    if ("14400".equals(baud) || "28800".equals(baud) || "38400".equals(baud)) {
+    if ("14400".equals(baud) || "28800".equals(baud)) {
       set("serial.debug_rate", "9600");
     }
   }