diff --git a/.gitignore b/.gitignore
index ad97ad1a39e..e791102e3a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ private_*
 readthedocs/htmlcov
 tags
 .python-version
+*.pyo
diff --git a/readthedocs/projects/tasks.py b/readthedocs/projects/tasks.py
index 68042afb331..173d23b5496 100644
--- a/readthedocs/projects/tasks.py
+++ b/readthedocs/projects/tasks.py
@@ -196,6 +196,7 @@ def run_setup(self, record=True):
             if not isinstance(self.setup_env.failure, vcs_support_utils.LockTimeout):
                 self.send_notifications()
 
+            self.setup_env.update_build(state=BUILD_STATE_FINISHED)
             return False
 
         if self.setup_env.successful and not self.project.has_valid_clone:
@@ -257,6 +258,8 @@ def run_build(self, docker=False, record=True):
 
         if self.build_env.failed:
             self.send_notifications()
+
+        self.build_env.update_build(state=BUILD_STATE_FINISHED)
         build_complete.send(sender=Build, build=self.build_env.build)
 
     @staticmethod