diff --git a/src/audio.cpp b/src/audio.cpp
index 5f6b820..b4323a2 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -212,12 +212,15 @@ bool audioLoop() {
     board.setMute(audioMute);
     stateBufferUpdateRequest();
   }
-  if (mp3Copier.copy() > 0) {
+
+  // TODO check snap too
+  if (mp3Copier.copy() > 0 || mp3Stream.availableForWrite() > 0) {
     copyErrors = 0;
     return true;
   }
+
   if (running) {
-    copyErrors++;
+    copyErrors = 100;
     if (copyErrors < 100) {
       return true;
     }