diff --git a/app/controllers/queue.coffee b/app/controllers/queue.coffee
index cabd5b7f..a89d1b28 100644
--- a/app/controllers/queue.coffee
+++ b/app/controllers/queue.coffee
@@ -1,9 +1,14 @@
 `import Ember from 'ember'`
 
 Controller = Ember.ArrayController.extend
+  isLoaded: false
   content: (->
-    @store.filter 'job', {}, (job) ->
+    result = @store.filter('job', {}, (job) ->
       ['created', 'queued'].indexOf(job.get('state')) != -1
+    )
+    result.then =>
+      @set('isLoaded', true)
+    result
   ).property()
 
 `export default Controller`
diff --git a/app/controllers/running-jobs.coffee b/app/controllers/running-jobs.coffee
index 44ca18fc..d7d21cb6 100644
--- a/app/controllers/running-jobs.coffee
+++ b/app/controllers/running-jobs.coffee
@@ -1,9 +1,14 @@
 `import Ember from 'ember'`
 
 Controller = Ember.ArrayController.extend
+  isLoaded: false
   content: (->
-    @store.filter 'job', { state: 'started' }, (job) ->
+    result = @store.filter('job', { state: 'started' }, (job) ->
       ['started', 'received'].indexOf(job.get('state')) != -1
+    )
+    result.then =>
+      @set('isLoaded', true)
+    result
   ).property()
 
 `export default Controller`
diff --git a/app/templates/queue.hbs b/app/templates/queue.hbs
index aef94c04..5a7d24d6 100644
--- a/app/templates/queue.hbs
+++ b/app/templates/queue.hbs
@@ -1,4 +1,4 @@
-
+{{#if isLoaded}}
 {{#if length}}
   {{#each job in controller}}
     <div {{bind-attr class=":tile :tile--sidebar job.state"}}>
@@ -22,4 +22,7 @@
   {{/each}}
 {{else}}
   <div class="spinner-container">There are no jobs queued</div>
-{{/if}}
\ No newline at end of file
+{{/if}}
+{{else}}
+  <span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
+{{/if}}
diff --git a/app/templates/running-jobs.hbs b/app/templates/running-jobs.hbs
index 35f6f33b..7a91eaef 100644
--- a/app/templates/running-jobs.hbs
+++ b/app/templates/running-jobs.hbs
@@ -1,5 +1,6 @@
 {{!-- <h4>Running Jobs ({{controller.length}})</h4> --}}
 
+{{#if isLoaded}}
 {{#if controller.length}}
   {{#each job in controller}}
     <div {{bind-attr class=":tile :tile--sidebar job.state"}}>
@@ -28,3 +29,6 @@
 {{else}}
   <div class="spinner-container">There are no jobs running</div>
 {{/if}}
+{{else}}
+  <span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
+{{/if}}