diff --git a/templates/esp32/src/main.ino b/templates/esp32/src/main.ino
index dc1f117..db8273f 100644
--- a/templates/esp32/src/main.ino
+++ b/templates/esp32/src/main.ino
@@ -51,7 +51,7 @@ void my_assert(bool b) {
 }
 
 void setup() {
-    SerialOut.begin(115200);
+    SerialOut.begin(500000);
     pinMode(CRYPTO_BUSY, OUTPUT);
     digitalWrite(CRYPTO_BUSY, HIGH);
     delay(100);
diff --git a/templates/esp32/src/uartp.c b/templates/esp32/src/uartp.c
index 03267dd..e520cfc 100644
--- a/templates/esp32/src/uartp.c
+++ b/templates/esp32/src/uartp.c
@@ -36,16 +36,15 @@ void uartp_send(const void *src, uint16_t len) {
 
 uint16_t uartp_recv(void *dst, uint16_t buf_len) {
     uint8_t *buf = (uint8_t *) dst;
-    uint8_t tag_old, tag, info, cs;
+    uint8_t tag, info, cs;
     uint16_t len;
 
     tag = AMUX_END;
     while (1) {
 
         do {
-            tag_old = tag;
             tag = uart_rbyte();
-        } while(tag != AMUX_TAG || tag_old != AMUX_END);
+        } while(tag != AMUX_TAG);
 
         len = (uint16_t) uart_rbyte();
         if (len & AMUX_EXT) {
diff --git a/templates/esp32/test b/templates/esp32/test
index 6794930..b6a2cff 100755
--- a/templates/esp32/test
+++ b/templates/esp32/test
@@ -115,7 +115,7 @@ def main(argv):
     eprint("Flashed")
     time.sleep(0.1)
 
-    ser = serial.Serial(dev, baudrate=115200, timeout=5)
+    ser = serial.Serial(dev, baudrate=500000, timeout=5)
     uartp = UARTP(ser)
 
     ser.setDTR(False)  # IO0=HIGH