diff --git a/daemon/core/emulator/session.py b/daemon/core/emulator/session.py
index c950fd4e..bef7f048 100644
--- a/daemon/core/emulator/session.py
+++ b/daemon/core/emulator/session.py
@@ -1351,17 +1351,16 @@ class Session:
         """
         # delete node and check for session shutdown if a node was removed
         logging.info("deleting node(%s)", _id)
-        result = False
+        node = None
         with self._nodes_lock:
             if _id in self.nodes:
                 node = self.nodes.pop(_id)
-                node.shutdown()
-                result = True
 
-        if result:
+        if node:
+            node.shutdown()
             self.check_shutdown()
 
-        return result
+        return node is not None
 
     def delete_nodes(self):
         """