diff --git a/common/models/Access-Token.js b/common/models/Access-Token.js
new file mode 100644
index 0000000000..b4d06ca096
--- /dev/null
+++ b/common/models/Access-Token.js
@@ -0,0 +1,12 @@
+import { Observable } from 'rx';
+
+module.exports = AccessToken => {
+  // wait for datasource to attach before adding methods
+  // prevents loopback from unnecessarily
+  // adding watchers on startup
+  AccessToken.on('dataSourceAttached', () => {
+    AccessToken.findOne$ = Observable.fromNodeCallback(
+      AccessToken.findOne.bind(AccessToken)
+    );
+  });
+};
diff --git a/server/boot/user.js b/server/boot/user.js
index 274887554d..596bc0b363 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -176,10 +176,6 @@ module.exports = function(app) {
     );
   }
 
-  AccessToken.findOne$ = Observable.fromNodeCallback(
-    AccessToken.findOne, AccessToken
-  );
-
   router.get('/login', function(req, res) {
     res.redirect(301, '/signin');
   });