diff --git a/packages/client-app/src/flux/stores/online-status-store.es6 b/packages/client-app/src/flux/stores/online-status-store.es6
index 3db999e9d..fc19efd7d 100644
--- a/packages/client-app/src/flux/stores/online-status-store.es6
+++ b/packages/client-app/src/flux/stores/online-status-store.es6
@@ -1,7 +1,7 @@
 import isOnline from 'is-online'
 import NylasStore from 'nylas-store'
+import {ExponentialBackoffScheduler} from 'isomorphic-core'
 import Actions from '../actions'
-import {ExponentialBackoffScheduler} from '../../services/backoff-schedulers'
 
 
 const CHECK_ONLINE_INTERVAL = 30 * 1000
diff --git a/packages/client-app/src/global/nylas-exports.es6 b/packages/client-app/src/global/nylas-exports.es6
index f9084b8b7..3ae905947 100644
--- a/packages/client-app/src/global/nylas-exports.es6
+++ b/packages/client-app/src/global/nylas-exports.es6
@@ -220,8 +220,6 @@ lazyLoad(`InlineStyleTransformer`, 'services/inline-style-transformer');
 lazyLoad(`SearchableComponentMaker`, 'searchable-components/searchable-component-maker');
 lazyLoad(`QuotedPlainTextTransformer`, 'services/quoted-plain-text-transformer');
 lazyLoad(`BatteryStatusManager`, 'services/battery-status-manager');
-lazyLoadWithGetter(`BackoffScheduler`, () => require('../services/backoff-schedulers').BackoffScheduler);
-lazyLoadWithGetter(`ExponentialBackoffScheduler`, () => require('../services/backoff-schedulers').ExponentialBackoffScheduler);
 
 // Errors
 lazyLoadWithGetter(`APIError`, () => require('../flux/errors').APIError);
diff --git a/packages/client-app/spec/services/backoff-scheduler-spec.es6 b/packages/isomorphic-core/spec/backoff-scheduler-spec.es6
similarity index 98%
rename from packages/client-app/spec/services/backoff-scheduler-spec.es6
rename to packages/isomorphic-core/spec/backoff-scheduler-spec.es6
index 4026c1644..f54ace848 100644
--- a/packages/client-app/spec/services/backoff-scheduler-spec.es6
+++ b/packages/isomorphic-core/spec/backoff-scheduler-spec.es6
@@ -1,4 +1,4 @@
-import {BackoffScheduler, ExponentialBackoffScheduler} from '../../src/services/backoff-schedulers'
+import {BackoffScheduler, ExponentialBackoffScheduler} from '../src/backoff-schedulers'
 
 
 describe('BackoffSchedulers', function describeBlock() {
diff --git a/packages/client-app/src/services/backoff-schedulers.es6 b/packages/isomorphic-core/src/backoff-schedulers.es6
similarity index 99%
rename from packages/client-app/src/services/backoff-schedulers.es6
rename to packages/isomorphic-core/src/backoff-schedulers.es6
index e513492f3..7c4620d59 100644
--- a/packages/client-app/src/services/backoff-schedulers.es6
+++ b/packages/isomorphic-core/src/backoff-schedulers.es6
@@ -1,8 +1,6 @@
-
 const BASE_TIMEOUT = 2 * 1000
 const MAX_TIMEOUT = 5 * 60 * 1000
 
-
 function exponentialBackoff(base, numTries) {
   return base * (2 ** numTries)
 }
@@ -57,3 +55,4 @@ export class ExponentialBackoffScheduler extends BackoffScheduler {
     super({...opts, getNextBackoffDelay: exponentialBackoff})
   }
 }
+