diff --git a/core/server/models/subscriber.js b/core/server/models/subscriber.js
index eccb7648de..cd8937373c 100644
--- a/core/server/models/subscriber.js
+++ b/core/server/models/subscriber.js
@@ -88,6 +88,12 @@ Subscriber = ghostBookshelf.Model.extend({
             if (subscriberWithEmail) {
                 return subscriberWithEmail;
             }
+        }).catch(function (error) {
+            if (error.message === 'NotFound' || error.message === 'EmptyResponse') {
+                return Promise.resolve();
+            }
+
+            return Promise.reject(error);
         });
     }
 });