diff --git a/js/esptool.js b/js/esptool.js
index f9e8bdd..29071e2 100644
--- a/js/esptool.js
+++ b/js/esptool.js
@@ -944,7 +944,7 @@ class EspLoader {
     this.logMsg("Running stub...")
     await this.memFinish(stub['entry']);
 
-    let p = await this.readBuffer(100);
+    let p = await this.readBuffer(500);
     p = String.fromCharCode(...p);
 
     if (p != 'OHAI') {
diff --git a/js/script.js b/js/script.js
index 11f0ebb..e992e72 100644
--- a/js/script.js
+++ b/js/script.js
@@ -460,7 +460,7 @@ function toggleUIConnected(connected) {
 function loadAllSettings() {
   // Load all saved settings or defaults
   autoscroll.checked = loadSetting('autoscroll', true);
-  baudRate.value = loadSetting('baudrate', 921600);
+  baudRate.value = loadSetting('baudrate', baudRates[0]);
   darkMode.checked = loadSetting('darkmode', false);
 }