diff --git a/buildman/server.py b/buildman/server.py
index f4a236155..13dd20444 100644
--- a/buildman/server.py
+++ b/buildman/server.py
@@ -136,8 +136,6 @@ class BuilderServer(object):
 
     if component in self._current_components:
       self._current_components.remove(component)
-
-    if component in self._session_factory:
       self._session_factory.remove(component)
 
   def _job_heartbeat(self, build_job):