diff --git a/app/models/repo.coffee b/app/models/repo.coffee
index 1e30a8d8..fdfe7ebf 100644
--- a/app/models/repo.coffee
+++ b/app/models/repo.coffee
@@ -28,9 +28,9 @@ Repo = Model.extend
   ).property('lastBuildId', 'lastBuildNumber')
 
   lastBuild: (->
-    id = @get('lastBuildId')
-    @store.find('build', id)
-    @store.recordForId('build', id)
+    if id = @get('lastBuildId')
+      @store.find('build', id)
+      @store.recordForId('build', id)
   ).property('lastBuildId')
 
   withLastBuild: ->