diff --git a/spec/ParseLiveQuery.spec.js b/spec/ParseLiveQuery.spec.js
new file mode 100644
index 00000000..74faa9ae
--- /dev/null
+++ b/spec/ParseLiveQuery.spec.js
@@ -0,0 +1,35 @@
+'use strict';
+
+describe('ParseLiveQuery', function() {
+  it('can subscribe to query', async done => {
+    await reconfigureServer({
+      liveQuery: {
+        classNames: ['TestObject'],
+      },
+      startLiveQueryServer: true,
+      verbose: false,
+      silent: true,
+    });
+    const object = new TestObject();
+    await object.save();
+
+    const query = new Parse.Query(TestObject);
+    query.equalTo('objectId', object.id);
+    const subscription = await query.subscribe();
+    subscription.on('update', async object => {
+      expect(object.get('foo')).toBe('bar');
+      done();
+    });
+    object.set({ foo: 'bar' });
+    await object.save();
+  });
+
+  afterEach(async function(done) {
+    const client = await Parse.CoreManager.getLiveQueryController().getDefaultLiveQueryClient();
+    client.close();
+    // Wait for live query client to disconnect
+    setTimeout(() => {
+      done();
+    }, 1000);
+  });
+});
diff --git a/spec/ParseWebSocketServer.spec.js b/spec/ParseWebSocketServer.spec.js
index e9a014dd..c9416f4c 100644
--- a/spec/ParseWebSocketServer.spec.js
+++ b/spec/ParseWebSocketServer.spec.js
@@ -39,6 +39,45 @@ describe('ParseWebSocketServer', function() {
     }, 10);
   });
 
+  it('can handle error event', async () => {
+    jasmine.restoreLibrary('ws', 'Server');
+    const WebSocketServer = require('ws').Server;
+    let wssError;
+    class WSSAdapter {
+      constructor(options) {
+        this.options = options;
+      }
+      onListen() {}
+      onConnection() {}
+      onError() {}
+      start() {
+        const wss = new WebSocketServer({ server: this.options.server });
+        wss.on('listening', this.onListen);
+        wss.on('connection', this.onConnection);
+        wss.on('error', error => {
+          wssError = error;
+          this.onError(error);
+        });
+        this.wss = wss;
+      }
+    }
+
+    const server = await reconfigureServer({
+      liveQuery: {
+        classNames: ['TestObject'],
+      },
+      liveQueryServerOptions: {
+        wssAdapter: WSSAdapter,
+      },
+      startLiveQueryServer: true,
+      verbose: false,
+      silent: true,
+    });
+    const wssAdapter = server.liveQueryServer.parseWebSocketServer.server;
+    wssAdapter.wss.emit('error', 'Invalid Packet');
+    expect(wssError).toBe('Invalid Packet');
+  });
+
   afterEach(function() {
     jasmine.restoreLibrary('ws', 'Server');
   });
diff --git a/src/Adapters/WebSocketServer/WSAdapter.js b/src/Adapters/WebSocketServer/WSAdapter.js
index 9494c9cb..5522dad3 100644
--- a/src/Adapters/WebSocketServer/WSAdapter.js
+++ b/src/Adapters/WebSocketServer/WSAdapter.js
@@ -13,10 +13,12 @@ export class WSAdapter extends WSSAdapter {
 
   onListen() {}
   onConnection(ws) {}
+  onError(error) {}
   start() {
     const wss = new WebSocketServer({ server: this.options.server });
     wss.on('listening', this.onListen);
     wss.on('connection', this.onConnection);
+    wss.on('error', this.onError);
   }
   close() {}
 }
diff --git a/src/Adapters/WebSocketServer/WSSAdapter.js b/src/Adapters/WebSocketServer/WSSAdapter.js
index d801b151..007cacdf 100644
--- a/src/Adapters/WebSocketServer/WSSAdapter.js
+++ b/src/Adapters/WebSocketServer/WSSAdapter.js
@@ -4,6 +4,7 @@
 // Adapter classes must implement the following functions:
 // * onListen()
 // * onConnection(ws)
+// * onError(error)
 // * start()
 // * close()
 //
@@ -22,6 +23,7 @@ export class WSSAdapter {
   constructor(options) {
     this.onListen = () => {};
     this.onConnection = () => {};
+    this.onError = () => {};
   }
 
   // /**
@@ -36,6 +38,13 @@ export class WSSAdapter {
   //  */
   // onConnection(ws) {}
 
+  // /**
+  //  * Emitted when error event is called.
+  //  *
+  //  * @param {Error} error - WebSocketServer error
+  //  */
+  // onError(error) {}
+
   /**
    * Initialize Connection.
    *
diff --git a/src/LiveQuery/ParseLiveQueryServer.js b/src/LiveQuery/ParseLiveQueryServer.js
index 1a44e03a..fc3d7e39 100644
--- a/src/LiveQuery/ParseLiveQueryServer.js
+++ b/src/LiveQuery/ParseLiveQueryServer.js
@@ -392,6 +392,8 @@ class ParseLiveQueryServer {
         event: 'ws_disconnect',
         clients: this.clients.size,
         subscriptions: this.subscriptions.size,
+        useMasterKey: client.hasMasterKey,
+        installationId: client.installationId,
       });
     });
 
diff --git a/src/LiveQuery/ParseWebSocketServer.js b/src/LiveQuery/ParseWebSocketServer.js
index 1c8ebb69..9e0d18d2 100644
--- a/src/LiveQuery/ParseWebSocketServer.js
+++ b/src/LiveQuery/ParseWebSocketServer.js
@@ -23,6 +23,9 @@ export class ParseWebSocketServer {
         }
       }, config.websocketTimeout || 10 * 1000);
     };
+    wss.onError = error => {
+      logger.error(error);
+    };
     wss.start();
     this.server = wss;
   }