diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
index bf9971013..c88860017 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
@@ -70,9 +70,9 @@ public class WifiStateChangeService extends Service {
                         (ipAddress >> 16 & 0xff),
                         (ipAddress >> 24 & 0xff));
 
-                FDroidApp.ssid = wifiInfo.getSSID();
-                if (FDroidApp.ssid != null) {
-                    FDroidApp.ssid.replaceAll("^\"(.*)\"$", "$1");
+                final String ssid = wifiInfo.getSSID();
+                if (ssid != null) {
+                    FDroidApp.ssid = ssid.replaceAll("^\"(.*)\"$", "$1");
                 }
                 FDroidApp.bssid = wifiInfo.getBSSID();