diff --git a/cores/arduino/SafeRingBuffer.h b/cores/arduino/SafeRingBuffer.h
index 7526ae54a..8ee1ca890 100644
--- a/cores/arduino/SafeRingBuffer.h
+++ b/cores/arduino/SafeRingBuffer.h
@@ -38,9 +38,12 @@ typedef SafeRingBufferN<SERIAL_BUFFER_SIZE> SafeRingBuffer;
 
 template <int N>
 int SafeRingBufferN<N>::read_char() {
+  int result = -1;
   synchronized {
-    return RingBufferN<N>::read_char();
+    result = RingBufferN<N>::read_char();
+    break;
   }
+  return result;
 }
 
 template <int N>