diff --git a/lib/streamsb-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamsbextractor/StreamSBExtractor.kt b/lib/streamsb-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamsbextractor/StreamSBExtractor.kt
index 9fa76ac51..8712caf57 100644
--- a/lib/streamsb-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamsbextractor/StreamSBExtractor.kt
+++ b/lib/streamsb-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamsbextractor/StreamSBExtractor.kt
@@ -26,7 +26,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
     // animension, asianload and dramacool uses "common = false"
     private fun fixUrl(url: String, common: Boolean): String {
         val host = url.toHttpUrl().host
-        val sbUrl = "https://$host/sources15"
+        val sbUrl = "https://$host/sources16"
         val id = url.substringAfter(host)
             .substringAfter("/e/")
             .substringAfter("/embed-")
@@ -42,13 +42,14 @@ class StreamSBExtractor(private val client: OkHttpClient) {
     }
 
     fun videosFromUrl(url: String, headers: Headers, prefix: String = "", suffix: String = "", common: Boolean = true, manualData: Boolean = false): List<Video> {
+        val trimmedUrl = url.trim() // Prevents some crashes
         val newHeaders = if(manualData) headers else headers.newBuilder()
-            .set("referer", url)
+            .set("referer", trimmedUrl)
             .set("watchsb", "sbstream")
             .set("authority", "embedsb.com")
             .build()
         return try {
-            val master = if(manualData) url else fixUrl(url, common)
+            val master = if(manualData) trimmedUrl else fixUrl(trimmedUrl, common)
             val json = Json { ignoreUnknownKeys = true }.decodeFromString<Response>(
                 client.newCall(GET(master, newHeaders))
                     .execute()