diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 913f415e..bc881a7d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -1118,7 +1118,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
     suspend fun checkGithubConnectivity(): Boolean {
         return try {
-            app.get("https://raw.githubusercontent.com/recloudstream/.github/master/connectivitycheck").text.trim() == "ok"
+            app.get("https://raw.githubusercontent.com/recloudstream/.github/master/connectivitycheck", timeout = 5).text.trim() == "ok"
         } catch (t: Throwable) {
             false
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
index ed8edf58..324b8ff1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
@@ -93,10 +93,15 @@ object RepositoryManager {
             }
         } else if (fixedUrl.matches("^[a-zA-Z0-9!_-]+$".toRegex())) {
             suspendSafeApiCall {
-                app.get("https://l.cloudstream.cf/${fixedUrl}").let {
-                    return@let if (it.isSuccessful && !it.url.startsWith("https://cutt.ly/branded-domains")) it.url
-                    else app.get("https://cutt.ly/${fixedUrl}").let let2@{ it2 ->
-                        return@let2 if (it2.isSuccessful) it2.url else null
+                app.get("https://l.cloudstream.cf/${fixedUrl}", allowRedirects = false).let {
+                    it.headers["Location"]?.let { url ->
+                        return@suspendSafeApiCall if (!url.startsWith("https://cutt.ly/branded-domains")) url
+                        else null
+                    }
+                    app.get("https://cutt.ly/${fixedUrl}", allowRedirects = false).let { it2 ->
+                        it2.headers["Location"]?.let { url ->
+                            return@suspendSafeApiCall if (url.startsWith("https://cutt.ly/404")) url else null
+                        }
                     }
                 }
             }