diff --git a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
index edd817e6..3ca0d846 100644
--- a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
+++ b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
@@ -57,7 +57,6 @@ namespace WebSocketSharp.Net.WebSockets
     private HttpRequest         _request;
     private Uri                 _requestUri;
     private bool                _secure;
-    private Socket              _socket;
     private Stream              _stream;
     private TcpClient           _tcpClient;
     private IPrincipal          _user;
@@ -79,8 +78,6 @@ namespace WebSocketSharp.Net.WebSockets
       _secure = secure;
       _log = log;
 
-      _socket = tcpClient.Client;
-
       var netStream = tcpClient.GetStream ();
 
       if (secure) {
@@ -119,7 +116,7 @@ namespace WebSocketSharp.Net.WebSockets
 
     internal Socket Socket {
       get {
-        return _socket;
+        return _tcpClient.Client;
       }
     }
 
@@ -385,7 +382,7 @@ namespace WebSocketSharp.Net.WebSockets
     /// </value>
     public override System.Net.IPEndPoint ServerEndPoint {
       get {
-        return (System.Net.IPEndPoint) _socket.LocalEndPoint;
+        return (System.Net.IPEndPoint) _tcpClient.Client.LocalEndPoint;
       }
     }
 
@@ -416,7 +413,7 @@ namespace WebSocketSharp.Net.WebSockets
     /// </value>
     public override System.Net.IPEndPoint UserEndPoint {
       get {
-        return (System.Net.IPEndPoint) _socket.RemoteEndPoint;
+        return (System.Net.IPEndPoint) _tcpClient.Client.RemoteEndPoint;
       }
     }