diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/TunnelExtensions.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/TunnelExtensions.kt
index 6e9f9a8..e49ef3a 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/TunnelExtensions.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/TunnelExtensions.kt
@@ -84,8 +84,8 @@ fun Config.toWgQuickString(): String {
 
 fun RootShell.getCurrentWifiName(): String? {
 	val response = mutableListOf<String>()
-	this.run(response, "dumpsys wifi | grep -o \"SSID: [^,]*\" | cut -d ' ' -f2- | tr -d '\"'")
-	return response.lastOrNull()
+	this.run(response, "dumpsys wifi | grep 'Supplicant state: COMPLETED' | grep -o 'SSID: [^,]*' | cut -d ' ' -f2- | tr -d '\"'")
+	return response.firstOrNull()
 }
 
 fun Backend.BackendState.asBackendState(): BackendState {