diff --git a/keba/integrationpluginkeba.cpp b/keba/integrationpluginkeba.cpp
index ccd0977d..1e976f5d 100644
--- a/keba/integrationpluginkeba.cpp
+++ b/keba/integrationpluginkeba.cpp
@@ -131,8 +131,13 @@ void IntegrationPluginKeba::setupThing(ThingSetupInfo *info)
         if (keba) {
             qCDebug(dcKeba()) << "Reconfigure" << thing->name() << thing->params();
             delete keba;
-            // Now continue with the normal setup
         }
+
+        if (m_monitors.contains(thing)) {
+            hardwareManager()->networkDeviceDiscovery()->unregisterMonitor(m_monitors.take(thing));
+        }
+
+        // Now continue with the normal setup..
     }
 
     qCDebug(dcKeba()) << "Setting up" << thing->name() << thing->params();