diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee
index b1dac327..3215cbcf 100644
--- a/assets/scripts/app/routes.coffee
+++ b/assets/scripts/app/routes.coffee
@@ -124,7 +124,8 @@ Travis.SetupLastBuild = Ember.Mixin.create
     # TODO: it would be nicer to do it with promises
     repo = @controllerFor('repo').get('repo')
     if repo && repo.get('isLoaded') && !repo.get('lastBuild')
-      @render('builds/not_found', outlet: 'pane', into: 'repo')
+      Ember.run.next =>
+        @render('builds/not_found', outlet: 'pane', into: 'repo')
 
 Travis.GettingStartedRoute = Ember.Route.extend
   setupController: ->
@@ -281,7 +282,8 @@ Travis.RepoRoute = Ember.Route.extend
         proxy.set 'isLoading', false
 
         if repos.get('length') == 0
-          self.render('repos/not_found', outlet: 'main')
+          Ember.run.next ->
+            self.render('repos/not_found', outlet: 'main')
         else
           proxy.set 'content', repos.objectAt(0)