diff --git a/app/src/main/java/org/oxycblt/auxio/util/StateUtil.kt b/app/src/main/java/org/oxycblt/auxio/util/StateUtil.kt
index eb8358867..7ac5f632d 100644
--- a/app/src/main/java/org/oxycblt/auxio/util/StateUtil.kt
+++ b/app/src/main/java/org/oxycblt/auxio/util/StateUtil.kt
@@ -186,7 +186,7 @@ suspend fun <E> ReceiveChannel<E>.forEachWithTimeout(
     var subsequent = false
     val handler: suspend () -> Unit = {
         val value = receiveCatching()
-        if (value.isClosed) {
+        if (value.isClosed && value.exceptionOrNull() == null) {
             exhausted = true
         } else {
             action(value.getOrThrow())