diff --git a/endpoints/api/build.py b/endpoints/api/build.py
index d8ab952f8..e7fdf2f11 100644
--- a/endpoints/api/build.py
+++ b/endpoints/api/build.py
@@ -70,10 +70,11 @@ def build_status_view(build_obj, can_write=False):
 
   # If the status contains a heartbeat, then check to see if has been written in the last few
   # minutes. If not, then the build timed out.
-  if status is not None and 'heartbeat' in status and status['heartbeat']:
-    heartbeat = datetime.datetime.fromtimestamp(status['heartbeat'])
-    if datetime.datetime.now() - heartbeat > datetime.timedelta(minutes=1):
-      phase = database.BUILD_PHASE.INTERNAL_ERROR
+  if phase != database.BUILD_PHASE.COMPLETE and phase != database.BUILD_PHASE.ERROR:
+    if status is not None and 'heartbeat' in status and status['heartbeat']:
+      heartbeat = datetime.datetime.fromtimestamp(status['heartbeat'])
+      if datetime.datetime.now() - heartbeat > datetime.timedelta(minutes=1):
+        phase = database.BUILD_PHASE.INTERNAL_ERROR
 
   logger.debug('Can write: %s job_config: %s', can_write, build_obj.job_config)
   resp = {