diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
index 9142fdc8..561a6ad6 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
@@ -105,7 +105,9 @@ class IpmiCommandWrapper(ipmicommand.Command):
             self.cfm, self.node, 'pubkeys.tls_hardwaremanager').verify_cert)
 
     def close_confluent(self):
-        self.cfm.remove_watcher(self._attribwatcher)
+        if self._attribwatcher:
+            self.cfm.remove_watcher(self._attribwatcher)
+            self._attribwatcher = None
 
     def _attribschanged(self, nodeattribs, configmanager, **kwargs):
         try: