diff --git a/services/sync/Weave.js b/services/sync/Weave.js
index bfa28a26e868..6f21edb69004 100644
--- a/services/sync/Weave.js
+++ b/services/sync/Weave.js
@@ -67,7 +67,9 @@ WeaveService.prototype = {
       this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
       this.timer.initWithCallback({
         notify: function() {
-          Cu.import("resource://services-sync/service.js");
+          Cu.import("resource://services-sync/main.js");
+          if (Weave.Status.checkSetup() != Weave.CLIENT_NOT_CONFIGURED)
+            Weave.Service;
         }
       }, 10000, Ci.nsITimer.TYPE_ONE_SHOT);
       break;