diff --git a/app/mixins/polling.coffee b/app/mixins/polling.coffee
index acc11490..f68d3fa7 100644
--- a/app/mixins/polling.coffee
+++ b/app/mixins/polling.coffee
@@ -1,5 +1,4 @@
 `import Ember from 'ember'`
-`import config from 'travis/config/environment'`
 
 mixin = Ember.Mixin.create
   polling: Ember.inject.service()
@@ -7,13 +6,11 @@ mixin = Ember.Mixin.create
   didInsertElement: ->
     @_super.apply(this, arguments)
 
-    return unless config.ajaxPolling
     @startPolling()
 
   willDestroyElement: ->
     @_super.apply(this, arguments)
 
-    return unless config.ajaxPolling
     @stopPolling()
 
   pollModelDidChange: (sender, key, value) ->
diff --git a/app/services/polling.coffee b/app/services/polling.coffee
index 1f83afdb..76d03544 100644
--- a/app/services/polling.coffee
+++ b/app/services/polling.coffee
@@ -3,6 +3,7 @@
 
 service = Ember.Service.extend
   pollingInterval: 30000
+  ajaxPolling: true
 
   init: ->
     @_super.apply(this, arguments)
@@ -10,9 +11,8 @@ service = Ember.Service.extend
     @set('watchedModels', [])
     @set('sources', [])
 
-    return unless config.ajaxPolling
-
     interval = setInterval =>
+      return unless config.ajaxPolling
       @poll()
     , @get('pollingInterval')
 
diff --git a/tests/unit/mixins/polling-test.coffee b/tests/unit/mixins/polling-test.coffee
index 1012b42c..e9259562 100644
--- a/tests/unit/mixins/polling-test.coffee
+++ b/tests/unit/mixins/polling-test.coffee
@@ -38,7 +38,7 @@ define('travis/components/polling-test', [], ->
 
 # I want to test this mixin in context of component, so I'm using
 # modelForComponent
-moduleForComponent 'polling-test', 'PollingTestComponent', {
+moduleForComponent 'polling-test', 'PollingMixin', {
   # specify the other units that are required for this test
   needs: []
 
diff --git a/tests/unit/services/polling-test.coffee b/tests/unit/services/polling-test.coffee
index 6bbe1ac9..e190ee30 100644
--- a/tests/unit/services/polling-test.coffee
+++ b/tests/unit/services/polling-test.coffee
@@ -1,10 +1,15 @@
 `import Ember from 'ember'`
 `import Polling from 'travis/services/polling'`
+`import config from 'travis/config/environment'`
 
 service = null
 
 module 'PollingService',
+  setup: ->
+    config.ajaxPolling = true
+
   teardown: ->
+    config.ajaxPolling = false
     unless service.get('isDestroyed')
       Ember.run ->
         service.destroy()