diff --git a/android/app/src/main/java/com/fabledsword/minstrel/player/output/OutputPickerController.kt b/android/app/src/main/java/com/fabledsword/minstrel/player/output/OutputPickerController.kt
index 69119c51..48fdc0de 100644
--- a/android/app/src/main/java/com/fabledsword/minstrel/player/output/OutputPickerController.kt
+++ b/android/app/src/main/java/com/fabledsword/minstrel/player/output/OutputPickerController.kt
@@ -353,36 +353,39 @@ class OutputPickerController @Inject constructor(
         )
         var consecutiveFailures = 0
         var succeeded = 0
+        var aborted = false
         for ((i, ref) in tracks.withIndex()) {
+            if (aborted) break
             if (activeUpnpHolder.active.value?.routeId != route.id) {
                 Timber.w("UPnP extend: cancelled at offset %d (route changed)", i)
-                break
-            }
-            val outcome = runCatching {
-                val token = streamTokens.mint(ref.id)
-                transport.addURIToQueue(
-                    uri = token.url,
-                    mime = token.mime,
-                    title = token.title,
-                    enqueuedURIPosition = startPosition + i + 1,
-                )
-            }
-            if (outcome.isSuccess) {
-                consecutiveFailures = 0
-                succeeded += 1
+                aborted = true
             } else {
-                consecutiveFailures += 1
-                val e = outcome.exceptionOrNull()
-                val detail = (e as? SoapFaultException)?.let {
-                    "code=${it.code} desc=${it.description}"
-                } ?: e?.message
-                Timber.w(e, "UPnP extend: append failed at offset %d -- %s", i, detail)
-                if (consecutiveFailures >= EXTEND_ABORT_AFTER_FAILURES) {
-                    Timber.w(
-                        "UPnP extend: aborting after %d consecutive failures",
-                        consecutiveFailures,
+                val outcome = runCatching {
+                    val token = streamTokens.mint(ref.id)
+                    transport.addURIToQueue(
+                        uri = token.url,
+                        mime = token.mime,
+                        title = token.title,
+                        enqueuedURIPosition = startPosition + i + 1,
                     )
-                    break
+                }
+                if (outcome.isSuccess) {
+                    consecutiveFailures = 0
+                    succeeded += 1
+                } else {
+                    consecutiveFailures += 1
+                    val e = outcome.exceptionOrNull()
+                    val detail = (e as? SoapFaultException)?.let {
+                        "code=${it.code} desc=${it.description}"
+                    } ?: e?.message
+                    Timber.w(e, "UPnP extend: append failed at offset %d -- %s", i, detail)
+                    if (consecutiveFailures >= EXTEND_ABORT_AFTER_FAILURES) {
+                        Timber.w(
+                            "UPnP extend: aborting after %d consecutive failures",
+                            consecutiveFailures,
+                        )
+                        aborted = true
+                    }
                 }
             }
         }