diff --git a/Cocoa/Document.m b/Cocoa/Document.m
index c7640dd..ab00373 100644
--- a/Cocoa/Document.m
+++ b/Cocoa/Document.m
@@ -564,8 +564,7 @@ static unsigned *multiplication_table_for_frequency(unsigned frequency)
 {
     [_hexTimer invalidate];
     [_audioLock lock];
-    memset(_audioBuffer, 0, (_audioBufferSize - _audioBufferPosition) * sizeof(*_audioBuffer));
-    _audioBufferPosition = _audioBufferNeeded;
+    _audioBufferPosition = _audioBufferNeeded = 0;
     [_audioLock signal];
     [_audioLock unlock];
     [_audioClient stop];
diff --git a/iOS/GBViewController.m b/iOS/GBViewController.m
index 5a95f7d..c67a890 100644
--- a/iOS/GBViewController.m
+++ b/iOS/GBViewController.m
@@ -891,10 +891,7 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
 - (void)postRun
 {
     [_audioLock lock];
-    if (_audioBuffer) {
-        memset(_audioBuffer, 0, (_audioBufferSize - _audioBufferPosition) * sizeof(*_audioBuffer));
-    }
-    _audioBufferPosition = _audioBufferNeeded;
+    _audioBufferPosition = _audioBufferNeeded = 0;
     [_audioLock signal];
     [_audioLock unlock];
     [_audioClient stop];