diff --git a/dom/push/PushService.jsm b/dom/push/PushService.jsm
index 58df708b8cbe..ae5417a1973d 100644
--- a/dom/push/PushService.jsm
+++ b/dom/push/PushService.jsm
@@ -513,7 +513,7 @@ this.PushService = {
     console.debug("startService()");
 
     if (this._state != PUSH_SERVICE_ACTIVATING) {
-      return;
+      return Promise.reject();
     }
 
     this._service = service;
@@ -523,9 +523,11 @@ this.PushService = {
       this._db = this._service.newPushDB();
     }
 
-    this._service.init(options, this, serverURI);
-    this._startObservers();
-    return this._dropExpiredRegistrations();
+    return this._service.init(options, this, serverURI)
+      .then(() => {
+        this._startObservers();
+        return this._dropExpiredRegistrations();
+      });
   },
 
   /**
diff --git a/dom/push/PushServiceHttp2.jsm b/dom/push/PushServiceHttp2.jsm
index 10d2112da4c8..57d7ad522323 100644
--- a/dom/push/PushServiceHttp2.jsm
+++ b/dom/push/PushServiceHttp2.jsm
@@ -572,6 +572,8 @@ this.PushServiceHttp2 = {
     console.debug("init()");
     this._mainPushService = aMainPushService;
     this._serverURI = aServerURL;
+
+    return Promise.resolve();
   },
 
   _retryAfterBackoff: function(aSubscriptionUri, retryAfter) {
diff --git a/dom/push/PushServiceWebSocket.jsm b/dom/push/PushServiceWebSocket.jsm
index 0d443331de18..edf22ff1c5b7 100644
--- a/dom/push/PushServiceWebSocket.jsm
+++ b/dom/push/PushServiceWebSocket.jsm
@@ -299,6 +299,8 @@ this.PushServiceWebSocket = {
     this._requestTimeout = prefs.get("requestTimeout");
     this._adaptiveEnabled = prefs.get('adaptive.enabled');
     this._upperLimit = prefs.get('adaptive.upperLimit');
+
+    return Promise.resolve();
   },
 
   _reconnect: function () {