diff --git a/app/src/main/kotlin/com/subtracks/data/repo/SourceRepository.kt b/app/src/main/kotlin/com/subtracks/data/repo/SourceRepository.kt
index f79b2576..3e8aaa34 100644
--- a/app/src/main/kotlin/com/subtracks/data/repo/SourceRepository.kt
+++ b/app/src/main/kotlin/com/subtracks/data/repo/SourceRepository.kt
@@ -140,9 +140,9 @@ class SourceRepository(
         // quality rather than the original that would then have to be transcoded on every play.
         val quality = downloadQuality
         return if (quality.transcodes) {
-            source.streamUri(songId, quality.maxBitrate, quality.format)?.toString()
+            source.streamUri(songId, quality.maxBitrate, quality.format).toString()
         } else {
-            source.downloadUri(songId)?.toString()
+            source.downloadUri(songId).toString()
         }
     }
 
diff --git a/app/src/test/kotlin/com/subtracks/data/repo/SourceRepositoryTest.kt b/app/src/test/kotlin/com/subtracks/data/repo/SourceRepositoryTest.kt
index 4a324e1a..b123d6ea 100644
--- a/app/src/test/kotlin/com/subtracks/data/repo/SourceRepositoryTest.kt
+++ b/app/src/test/kotlin/com/subtracks/data/repo/SourceRepositoryTest.kt
@@ -84,7 +84,7 @@ class SourceRepositoryTest {
             }
 
             assertTrue(transcoded!!.contains("maxBitRate=128"))
-            assertTrue(transcoded!!.contains("format=opus"))
+            assertTrue(transcoded.contains("format=opus"))
         }
 
     @Test