diff --git a/emscripten/library_rwebaudio.js b/emscripten/library_rwebaudio.js
index 85f257d74f3..dfbca1e228d 100644
--- a/emscripten/library_rwebaudio.js
+++ b/emscripten/library_rwebaudio.js
@@ -35,6 +35,8 @@ var LibraryRWebAudio = {
                RA.buffers[RA.numBuffers - 1] = buf[0];
                i--;
                RA.bufIndex--;
+            } else if (!RA.startTime) {
+                RA.setStartTime();
             }
          }
       },
@@ -74,7 +76,7 @@ var LibraryRWebAudio = {
       block: function() {
          do {
             RA.process();
-         } while (RA.bufIndex === RA.numBuffers-2);
+         } while (RA.bufIndex === RA.numBuffers);
       }
    },
 
@@ -87,8 +89,6 @@ var LibraryRWebAudio = {
 
       RA.numBuffers = ((latency * RA.context.sampleRate) / (1000 * RA.BUFFER_SIZE))|0;
       if (RA.numBuffers < 2) RA.numBuffers = 2;
-      
-      RA.numBuffers++;
 
       for (var i = 0; i < RA.numBuffers; i++) {
          RA.buffers[i] = RA.context.createBuffer(2, RA.BUFFER_SIZE, RA.context.sampleRate);
@@ -114,7 +114,7 @@ var LibraryRWebAudio = {
       var count = 0;
 
       while (samples) {
-         if (RA.bufIndex === RA.numBuffers-2) {
+         if (RA.bufIndex === RA.numBuffers) {
             if (RA.nonblock) break;
             else RA.block();
          }