diff --git a/android/app/src/main/java/com/fabledsword/minstrel/connectivity/ConnectivityObserver.kt b/android/app/src/main/java/com/fabledsword/minstrel/connectivity/ConnectivityObserver.kt
index 28390ba6..49470361 100644
--- a/android/app/src/main/java/com/fabledsword/minstrel/connectivity/ConnectivityObserver.kt
+++ b/android/app/src/main/java/com/fabledsword/minstrel/connectivity/ConnectivityObserver.kt
@@ -62,9 +62,9 @@ class ConnectivityObserver @Inject constructor(
     }.distinctUntilChanged()
 
     private fun hasUsableInternet(): Boolean {
-        val active = cm.activeNetwork ?: return false
-        val caps = cm.getNetworkCapabilities(active) ?: return false
-        return caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
+        val caps = cm.activeNetwork?.let { cm.getNetworkCapabilities(it) }
+        return caps != null &&
+            caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
             caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
     }
 }