diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index e484af7..173f4dc 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -983,11 +983,10 @@
                     for (auto& iface : ifaces)
                     {
                         auto sharedPtr = iface.lock();
-                        if (!sharedPtr)
+                        if (!!sharedPtr)
                         {
-                            continue; // was already deleted elsewhere
+                            objServer.remove_interface(sharedPtr);
                         }
-                        objServer.remove_interface(sharedPtr);
                     }
                     ifaces.clear();
                     systemConfiguration.erase(name);