diff --git a/src/ui/public/courier/data_source/_abstract.js b/src/ui/public/courier/data_source/_abstract.js
index 0099c3d2bd33..0843e9b5b53c 100644
--- a/src/ui/public/courier/data_source/_abstract.js
+++ b/src/ui/public/courier/data_source/_abstract.js
@@ -144,7 +144,10 @@ define(function (require) {
     SourceAbstract.prototype.onError = function (handler) {
       var self = this;
 
-      return new PromiseEmitter(function (resolve, reject, defer) {
+      return new PromiseEmitter(function (resolve, reject) {
+        const defer = Promise.defer();
+        defer.promise.then(resolve, reject);
+
         errorHandlers.push({
           source: self,
           defer: defer