diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java b/F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java
index a5ab3a6b9..7497ca68b 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java
@@ -78,12 +78,9 @@ public class BonjourBroadcast extends SwapType {
 
     private void clearCurrentMDNSService() {
         if (jmdns != null) {
-            if (pairService != null) {
-                jmdns.unregisterService(pairService);
-                pairService = null;
-            }
             jmdns.unregisterAllServices();
             Utils.closeQuietly(jmdns);
+            pairService = null;
             jmdns = null;
         }
     }