diff --git a/dom/media/test/crashtests/offline-buffer-source-ended-1.html b/dom/media/test/crashtests/offline-buffer-source-ended-1.html
index ce636654b8b3..0631021126bc 100644
--- a/dom/media/test/crashtests/offline-buffer-source-ended-1.html
+++ b/dom/media/test/crashtests/offline-buffer-source-ended-1.html
@@ -1,10 +1,7 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <script>
-// Currently this test fails unless an extra block is processed after the
-// BufferSource finishes. 12033 ≡ 1 (mod 128), but the test should pass even
-// when only 12001 samples are processed.
-var context = new window.OfflineAudioContext(1, 12033, 12000);
+var context = new window.OfflineAudioContext(1, 12001, 12000);
 
 var source = context.createBufferSource();
 source.buffer = context.createBuffer(1, 12000, context.sampleRate);
diff --git a/dom/media/webaudio/AudioBufferSourceNode.cpp b/dom/media/webaudio/AudioBufferSourceNode.cpp
index 3cd887bceb4e..50c0a94c4bfc 100644
--- a/dom/media/webaudio/AudioBufferSourceNode.cpp
+++ b/dom/media/webaudio/AudioBufferSourceNode.cpp
@@ -473,15 +473,6 @@ public:
     }
 
     StreamTime streamPosition = mDestination->GraphTimeToStreamTime(aFrom);
-    // We've finished if we've gone past mStop, or if we're past mDuration when
-    // looping is disabled.
-    if (streamPosition >= mStop ||
-        (!mLoop && mBufferPosition >= mBufferEnd && !mRemainingResamplerTail)) {
-      *aFinished = true;
-      aOutput->SetNull(WEBAUDIO_BLOCK_SIZE);
-      return;
-    }
-
     uint32_t channels = mBuffer ? mBuffer->GetChannels() : 0;
 
     UpdateSampleRateIfNeeded(channels, streamPosition);
@@ -514,6 +505,13 @@ public:
         }
       }
     }
+
+    // We've finished if we've gone past mStop, or if we're past mDuration when
+    // looping is disabled.
+    if (streamPosition >= mStop ||
+        (!mLoop && mBufferPosition >= mBufferEnd && !mRemainingResamplerTail)) {
+      *aFinished = true;
+    }
   }
 
   virtual bool IsActive() const override
