diff --git a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/IchnaeaServiceClient.kt b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/IchnaeaServiceClient.kt
index 1cb10da765029b56b6c9969846d2288f63a73946..0e9056f9c1b9c52f9d602695117b61940869b7a4 100644
--- a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/IchnaeaServiceClient.kt
+++ b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/IchnaeaServiceClient.kt
@@ -87,7 +87,6 @@ class IchnaeaServiceClient(private val context: Context) {
 
     suspend fun retrieveMultiWifiLocation(wifis: List<WifiDetails>, rawHandler: ((WifiDetails, Location) -> Unit)? = null): Location? = geoLocate(
         GeolocateRequest(
-            considerIp = false,
             wifiAccessPoints = wifis.filter { isRequestable(it) }.map(WifiDetails::toWifiAccessPoint),
             fallbacks = Fallback(lacf = true, ipf = true)
         ),
diff --git a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/wifi/extensions.kt b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/wifi/extensions.kt
index f991762bf0372065beeddd8984a42232a32dd132..1dfc59a3932ee8383e20dbe8f90252fbefc99c7c 100644
--- a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/wifi/extensions.kt
+++ b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/wifi/extensions.kt
@@ -24,9 +24,9 @@ internal fun ScanResult.toWifiDetails(): WifiDetails = WifiDetails(
 
 @RequiresApi(31)
 internal fun WifiInfo.toWifiDetails(): WifiDetails = WifiDetails(
-    macAddress = bssid,
-    ssid = ssid.takeIf { it != WifiManager.UNKNOWN_SSID && it.startsWith("\"") && it.endsWith("\"") }
-        ?.let { it.substring(1, it.length - 1) },
+    macAddress = bssid ?: "02:00:00:00:00:00",
+    ssid = ssid?.removeSurrounding("\"")
+        ?.takeIf { it.isNotEmpty() && it != WifiManager.UNKNOWN_SSID },
     timestamp = System.currentTimeMillis(),
     frequency = frequency,
     signalStrength = rssi,