diff --git a/app/mixins/polling.coffee b/app/mixins/polling.coffee
index b55b7c1b..6e8638b7 100644
--- a/app/mixins/polling.coffee
+++ b/app/mixins/polling.coffee
@@ -25,9 +25,15 @@ mixin = Ember.Mixin.create
     @stopPollingModel(key)
 
   pollModel: (property) ->
-    model = @get(property)
+    addToPolling = (model) =>
+      @get('polling').startPolling(model)
 
-    @get('polling').startPolling(model)
+    if model = @get(property)
+      if model.then
+        model.then (resolved) ->
+          addToPolling(resolved)
+      else
+        addToPolling(model)
 
   stopPollingModel: (property) ->
     model = @get(property)