diff --git a/websocket-sharp/Net/HttpConnection.cs b/websocket-sharp/Net/HttpConnection.cs
index 718a4432..ef7abfe6 100644
--- a/websocket-sharp/Net/HttpConnection.cs
+++ b/websocket-sharp/Net/HttpConnection.cs
@@ -456,8 +456,6 @@ namespace WebSocketSharp.Net
 
     private void registerContext (HttpListener listener)
     {
-      _context.Listener = listener;
-
       if (!listener.RegisterContext (_context)) {
         _context.ErrorStatusCode = 503;
         _context.SendError ();
diff --git a/websocket-sharp/Net/HttpListener.cs b/websocket-sharp/Net/HttpListener.cs
index 1739b008..79290a22 100644
--- a/websocket-sharp/Net/HttpListener.cs
+++ b/websocket-sharp/Net/HttpListener.cs
@@ -646,6 +646,8 @@ namespace WebSocketSharp.Net
         if (!_listening)
           return false;
 
+        context.Listener = this;
+
         _contextRegistry.AddLast (context);
 
         if (_waitQueue.Count == 0) {