diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift
index 51e9523..758bc43 100644
--- a/Source/SocketEngine.swift
+++ b/Source/SocketEngine.swift
@@ -244,10 +244,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
 
     private func createWebsocketAndConnect() {
         
-        if let oldWs = ws {
-            oldWs.delegate = nil
-        }
-        
+        ws?.delegate = nil
         ws = WebSocket(url: urlWebSocketWithSid as URL)
 
         if cookies != nil {
diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift
index 3660bda..a96ceda 100644
--- a/Source/SocketIOClient.swift
+++ b/Source/SocketIOClient.swift
@@ -120,10 +120,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable
     private func addEngine() -> SocketEngineSpec {
         DefaultSocketLogger.Logger.log("Adding engine", type: logType, args: "")
 
-        if let oldEngine = engine {
-            oldEngine.client = nil
-        }
-        
+        engine?.client = nil
         engine = SocketEngine(client: self, url: socketURL, config: config)
 
         return engine!