diff --git a/src/hasp_debug.cpp b/src/hasp_debug.cpp
index 740a464c..fb9b89d7 100644
--- a/src/hasp_debug.cpp
+++ b/src/hasp_debug.cpp
@@ -389,8 +389,8 @@ void debugPreSetup(JsonObject settings)
     Log.setPrefix(debugPrintPrefix); // Uncomment to get timestamps as prefix
     Log.setSuffix(debugPrintSuffix); // Uncomment to get newline as suffix
 
-    uint16_t baudrate = settings[FPSTR(F_CONFIG_BAUD)].as<uint16_t>();
-    if(baudrate > 0) {
+    uint16_t baudrate = settings[FPSTR(F_CONFIG_BAUD)].as<uint16_t>() | debugSerialBaud;
+    if(baudrate >= 960) {            /* the baudrates are stored divided by 10 */
         Serial.begin(baudrate * 10); /* prepare for possible serial debug */
         delay(10);
         debugSerialStarted = true;
diff --git a/src/hasp_http.cpp b/src/hasp_http.cpp
index a9a85a0f..666b0725 100644
--- a/src/hasp_http.cpp
+++ b/src/hasp_http.cpp
@@ -1550,7 +1550,7 @@ void webHandleDebugConfig()
 
     uint16_t baudrate = settings[FPSTR(F_CONFIG_BAUD)].as<uint16_t>();
     httpMessage += F("<p><b>Serial Port</b> <select id='baud' name='baud'>");
-    httpMessage += getOption(0, F("Disabled"), baudrate == 0);
+    httpMessage += getOption(1, F("Disabled"), baudrate == 1); // Don't use 0 here which is default 115200
     httpMessage += getOption(960, F("9600"), baudrate == 960);
     httpMessage += getOption(1920, F("19200"), baudrate == 1920);
     httpMessage += getOption(3840, F("38400"), baudrate == 3840);