diff --git a/src/main/index.js b/src/main/index.js
index 3e734c33..d1f49533 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -447,7 +447,7 @@ ipcMain.on('start-directmessages-streaming', (event, ac) => {
       directMessagesStreaming = new StreamingManager(account)
       directMessagesStreaming.start(
         'direct',
-        null,
+        '',
         (update) => {
           event.sender.send('update-start-directmessages-streaming', update)
         },
@@ -484,7 +484,7 @@ ipcMain.on('start-local-streaming', (event, ac) => {
       localStreaming = new StreamingManager(account)
       localStreaming.start(
         'public/local',
-        null,
+        '',
         (update) => {
           event.sender.send('update-start-local-streaming', update)
         },
@@ -521,7 +521,7 @@ ipcMain.on('start-public-streaming', (event, ac) => {
       publicStreaming = new StreamingManager(account)
       publicStreaming.start(
         'public',
-        null,
+        '',
         (update) => {
           event.sender.send('update-start-public-streaming', update)
         },
diff --git a/src/main/streaming.js b/src/main/streaming.js
index 248dbcb7..32680d20 100644
--- a/src/main/streaming.js
+++ b/src/main/streaming.js
@@ -56,6 +56,14 @@ export default class Streaming {
 
   stop () {
     if (this.listener) {
+      this.listener.removeAllListeners('connect')
+      this.listener.removeAllListeners('update')
+      this.listener.removeAllListeners('notification')
+      this.listener.removeAllListeners('error')
+      this.listener.removeAllListeners('parser-error')
+      this.listener.on('error', (e) => {
+        log.error(e)
+      })
       this.listener.stop()
       log.info('streaming stopped')
     }
diff --git a/src/main/websocket.js b/src/main/websocket.js
index 681ae007..93b52306 100644
--- a/src/main/websocket.js
+++ b/src/main/websocket.js
@@ -67,12 +67,15 @@ export default class WebSocket {
 
   stop () {
     if (this.listener) {
-      this.listener.stop()
       this.listener.removeAllListeners('connect')
       this.listener.removeAllListeners('update')
       this.listener.removeAllListeners('notification')
       this.listener.removeAllListeners('error')
       this.listener.removeAllListeners('parser-error')
+      this.listener.on('error', (e) => {
+        log.error(e)
+      })
+      this.listener.stop()
       log.info('streaming stopped')
     }
   }