diff --git a/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/discovery/MdnsBrainDiscovery.java b/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/discovery/MdnsBrainDiscovery.java
index b9476bd65719c..6065d5e33f487 100644
--- a/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/discovery/MdnsBrainDiscovery.java
+++ b/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/discovery/MdnsBrainDiscovery.java
@@ -438,7 +438,7 @@ private InetAddress getIpAddress(ServiceInfo service) {
 
     @Override
     public void close() {
-        context.getMdnsClient().unregisterAllServices();
+        context.getMdnsClient().removeServiceListener(NeeoConstants.NEEO_MDNS_TYPE, mdnsListener);
         systemsLock.lock();
         try {
             save();