diff --git a/src/blackmisc/dbusserver.cpp b/src/blackmisc/dbusserver.cpp
index 65d085519..adf70144e 100644
--- a/src/blackmisc/dbusserver.cpp
+++ b/src/blackmisc/dbusserver.cpp
@@ -232,6 +232,8 @@ namespace BlackMisc
         if (! object) { return; }
         m_objects.insert(path, object); // will be registered when P2P connection is established
 
+        QObject::connect(object, &QObject::destroyed, this, [this, path] { m_objects.remove(path); });
+
         switch (m_serverMode)
         {
         case SERVERMODE_SESSIONBUS: