diff --git a/buildman/component/buildcomponent.py b/buildman/component/buildcomponent.py
index 51819e95b..bc04c7b28 100644
--- a/buildman/component/buildcomponent.py
+++ b/buildman/component/buildcomponent.py
@@ -359,10 +359,10 @@ class BuildComponent(BaseComponent):
 
   def _on_heartbeat(self):
     """ Updates the last known heartbeat. """
-    if not self._current_job or self._component_status == ComponentStatus.TIMED_OUT:
+    if self._component_status == ComponentStatus.TIMED_OUT:
       return
 
-    logger.debug('Got heartbeat for build %s', self._current_job.repo_build.uuid)
+    logger.debug('got heartbeat on realm %s', self.builder_realm)
     self._last_heartbeat = datetime.datetime.utcnow()
 
   @trollius.coroutine