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 0ce4bcc4f..d1e070e8c 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/type/WifiSwap.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/type/WifiSwap.java
@@ -69,6 +69,12 @@ public class WifiSwap extends SwapType {
                         Log.i(TAG, "we've been asked to stop the webserver: " + msg.obj);
                         setConnected(false);
                         localHttpd.stop();
+                        Looper looper = Looper.myLooper();
+                        if (looper == null) {
+                            Log.e(TAG, "Looper.myLooper() was null for sum reason while shutting down the swap webserver.");
+                        } else {
+                            looper.quit();
+                        }
                     }
                 };
                 try {