diff --git a/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt b/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt
index b369bd2c3..81539f0f2 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt
@@ -23,6 +23,7 @@ import android.content.pm.PackageManager
 import android.database.Cursor
 import android.os.Build
 import androidx.core.content.ContextCompat
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.oxycblt.auxio.BuildConfig
@@ -153,8 +154,12 @@ class Indexer {
                     logE("No music found")
                     Response.NoMusic
                 }
+            } catch (e: CancellationException) {
+                // Got cancelled, propagate upwards
+                logD("Loading routine was cancelled")
+                throw e
             } catch (e: Exception) {
-                logE("Music indexing failed.")
+                logE("Music indexing failed")
                 logE(e.stackTraceToString())
                 Response.Err(e)
             }
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt
index 8e5dc5243..b9e5b4deb 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt
@@ -64,8 +64,7 @@ import org.oxycblt.auxio.util.logD
  * TODO: Remove the player callback once smooth seeking is implemented
  *
  * TODO: Rework what is considered to "start foreground" and what is not from the context of this
- *  object. This could help reduce the amount of post calls I send on Android 13 onwards,
- *  hopefully.
+ * object. This could help reduce the amount of post calls I send on Android 13 onwards, hopefully.
  */
 class MediaSessionComponent(
     private val context: Context,