diff --git a/index.js b/index.js
index ff7f5fb..ad66e76 100644
--- a/index.js
+++ b/index.js
@@ -76,6 +76,8 @@ class Socket {
   }
 
   disconnect () {
+    this.handlers = {};
+    this.onAnyHandler = null;
     this.sockets.disconnect();
   }
 
diff --git a/ios/RNSwiftSocketIO/Socket.swift b/ios/RNSwiftSocketIO/Socket.swift
index f13c035..741068d 100644
--- a/ios/RNSwiftSocketIO/Socket.swift
+++ b/ios/RNSwiftSocketIO/Socket.swift
@@ -64,7 +64,7 @@ class SocketIO: NSObject {
   @objc func addHandlers(handlers: NSDictionary) -> Void {
     for handler in handlers {
       self.socket.on(handler.key as! String) { data, ack in
-        self.bridge.eventDispatcher.sendDeviceEventWithName(
+        self.bridge.eventDispatcher().sendDeviceEventWithName(
           "socketEvent", body: handler.key as! String)
       }
     }
@@ -84,10 +84,10 @@ class SocketIO: NSObject {
 
   private func onAnyEventHandler (sock: SocketAnyEvent) -> Void {
     if let items = sock.items {
-      self.bridge.eventDispatcher.sendDeviceEventWithName("socketEvent",
+      self.bridge.eventDispatcher().sendDeviceEventWithName("socketEvent",
         body: ["name": sock.event, "items": items])
     } else {
-      self.bridge.eventDispatcher.sendDeviceEventWithName("socketEvent",
+      self.bridge.eventDispatcher().sendDeviceEventWithName("socketEvent",
         body: ["name": sock.event])
     }
   }