diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
index cf255d93a..e1f185d61 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
@@ -257,7 +257,11 @@ public class WifiStateChangeService extends IntentService {
                 Utils.debugLog(TAG, "WifiConfiguration: " + wifiConfiguration);
                 if (wifiConfiguration == null) {
                     FDroidApp.ssid = getString(R.string.swap_active_hotspot, "");
-                } else if (wifiConfiguration.hiddenSSID) {
+                    FDroidApp.bssid = "";
+                    return;
+                }
+
+                if (wifiConfiguration.hiddenSSID) {
                     FDroidApp.ssid = getString(R.string.swap_hidden_wifi_ssid);
                 } else {
                     FDroidApp.ssid = wifiConfiguration.SSID;