diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
index fa912a899..51d9ab3b7 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
@@ -65,10 +65,10 @@ import java.util.Set;
 public class FDroidApp extends Application {
 
     // for the local repo on this device, all static since there is only one
-    public static int port = 8888;
-    public static String ipAddressString = null;
-    public static String ssid = "";
-    public static String bssid = "";
+    public static int port;
+    public static String ipAddressString;
+    public static String ssid ;
+    public static String bssid;
     public static final Repo repo = new Repo();
     public static Set<String> selectedApps = null; // init in SelectLocalAppsFragment
 
@@ -132,6 +132,13 @@ public class FDroidApp extends Application {
         }
     }
 
+    public static void initWifiSettings() {
+        port = 8888;
+        ipAddressString = null;
+        ssid = "";
+        bssid = "";
+    }
+
     public static void updateLanguage(Context c) {
         SharedPreferences prefs = PreferenceManager
                 .getDefaultSharedPreferences(c);
@@ -231,6 +238,7 @@ public class FDroidApp extends Application {
         // TODO reintroduce PinningTrustManager and MemorizingTrustManager
 
         // initialized the local repo information
+        FDroidApp.initWifiSettings();
         WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
         int wifiState = wifiManager.getWifiState();
         if (wifiState == WifiManager.WIFI_STATE_ENABLING
diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
index ec5c01df5..934dd46ed 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
@@ -43,6 +43,7 @@ public class WifiStateChangeService extends Service {
             wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
             try {
                 while (!wifiManager.isWifiEnabled()) {
+                    FDroidApp.initWifiSettings();
                     if (isCancelled())
                         return null;
                     if (BuildConfig.DEBUG) {
diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
index f0b5717cb..1a736386a 100644
--- a/F-Droid/src/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
+++ b/F-Droid/src/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
 
+import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.net.WifiStateChangeService;
 
 public class WifiStateChangeReceiver extends BroadcastReceiver {
@@ -15,6 +16,8 @@ public class WifiStateChangeReceiver extends BroadcastReceiver {
         NetworkInfo ni = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
         if (ni.isConnected()) {
             context.startService(new Intent(context, WifiStateChangeService.class));
+        } else {
+            FDroidApp.initWifiSettings();
         }
     }
 }