diff --git a/spec/EnableExpressErrorHandler.spec.js b/spec/EnableExpressErrorHandler.spec.js
index fa73d21fb3..26483ec6a1 100644
--- a/spec/EnableExpressErrorHandler.spec.js
+++ b/spec/EnableExpressErrorHandler.spec.js
@@ -2,6 +2,7 @@ const request = require('../lib/request');
 
 describe('Enable express error handler', () => {
   it('should call the default handler in case of error, like updating a non existing object', async done => {
+    spyOn(console, 'error');
     const parseServer = await reconfigureServer(
       Object.assign({}, defaultConfiguration, {
         enableExpressErrorHandler: true,
diff --git a/src/Adapters/PubSub/EventEmitterPubSub.js b/src/Adapters/PubSub/EventEmitterPubSub.js
index 1ecc006e0c..277118a082 100644
--- a/src/Adapters/PubSub/EventEmitterPubSub.js
+++ b/src/Adapters/PubSub/EventEmitterPubSub.js
@@ -46,6 +46,10 @@ function createPublisher(): any {
 }
 
 function createSubscriber(): any {
+  // createSubscriber is called once at live query server start
+  // to avoid max listeners warning, we should clean up the event emitter
+  // each time this function is called
+  emitter.removeAllListeners();
   return new Subscriber(emitter);
 }