diff --git a/websocket-sharp/Net/HttpConnection.cs b/websocket-sharp/Net/HttpConnection.cs
index a4869a39..801f71de 100644
--- a/websocket-sharp/Net/HttpConnection.cs
+++ b/websocket-sharp/Net/HttpConnection.cs
@@ -319,6 +319,9 @@ namespace WebSocketSharp.Net
           HttpListener lsnr;
 
           if (conn._listener.TrySearchHttpListener (url, out lsnr)) {
+            if (!lsnr.AuthenticateContext (conn._context))
+              return;
+
             conn.registerContext (lsnr);
 
             return;
@@ -455,9 +458,6 @@ namespace WebSocketSharp.Net
     {
       _context.Listener = listener;
 
-      if (!listener.AuthenticateContext (_context))
-        return;
-
       if (!_context.Register ()) {
         _context.ErrorStatusCode = 503;
         _context.SendError ();