diff --git a/pyghmi/ipmi/private/session.py b/pyghmi/ipmi/private/session.py
index 934158d6..535cb18e 100644
--- a/pyghmi/ipmi/private/session.py
+++ b/pyghmi/ipmi/private/session.py
@@ -388,6 +388,7 @@ class Session(object):
         # since our connection has failed retries
         # deregister our keepalive facility
         Session.keepalive_sessions.pop(self, None)
+        Session.waiting_sessions.pop(self, None)
         if self.logged:
             self.logged = 0  # mark session as busted
             self._customkeepalives = None