diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/WifiSwap.java b/F-Droid/src/org/fdroid/fdroid/localrepo/type/WifiSwap.java
index 70634d28e..0ce4bcc4f 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/type/WifiSwap.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/type/WifiSwap.java
@@ -42,10 +42,14 @@ public class WifiSwap extends SwapType {
 
     @Override
     public void start() {
-
         Utils.debugLog(TAG, "Preparing swap webserver.");
         sendBroadcast(SwapService.EXTRA_STARTING);
 
+        if (FDroidApp.ipAddressString == null) {
+            Log.e(TAG, "Not starting swap webserver, because we don't seem to be connected to a network.");
+            setConnected(false);
+        }
+        
         Runnable webServer = new Runnable() {
             // Tell Eclipse this is not a leak because of Looper use.
             @SuppressLint("HandlerLeak")