diff --git a/src/emqttd_protocol.erl b/src/emqttd_protocol.erl
index b6eb96cf3..e1c509cdb 100644
--- a/src/emqttd_protocol.erl
+++ b/src/emqttd_protocol.erl
@@ -54,6 +54,7 @@
                       keepalive,
                       max_clientid_len = ?MAX_CLIENTID_LEN,
                       client_pid,
+                      ws_cookie, %% for websocket client
                       connected_at}).
 
 -type proto_state() :: #proto_state{}.
@@ -65,10 +66,12 @@
 
 init(Peername, SendFun, Opts) ->
     MaxLen = proplists:get_value(max_clientid_len, Opts, ?MAX_CLIENTID_LEN),
+    WsCookie = proplists:get_value(ws_cookie, Opts),
 	#proto_state{peername         = Peername,
                  sendfun          = SendFun,
                  max_clientid_len = MaxLen,
-                 client_pid       = self()}.
+                 client_pid       = self(),
+                 ws_cookie        = WsCookie}.
 
 info(#proto_state{client_id	   = ClientId,
                   username     = Username,
@@ -100,6 +103,7 @@ client(#proto_state{client_id  = ClientId,
                     keepalive  = Keepalive,
                     will_msg   = WillMsg,
                     client_pid = Pid,
+                    ws_cookie  = WsCookie,
                     connected_at = Time}) ->
     WillTopic = if
                     WillMsg =:= undefined -> undefined;
@@ -113,6 +117,7 @@ client(#proto_state{client_id  = ClientId,
                  proto_ver  = ProtoVer,
                  keepalive  = Keepalive,
                  will_topic = WillTopic,
+                 ws_cookie  = WsCookie,
                  connected_at = Time}.
 
 %% CONNECT – Client requests a connection to a Server
diff --git a/src/emqttd_ws_client.erl b/src/emqttd_ws_client.erl
index 55fb14c0c..28c6f91ed 100644
--- a/src/emqttd_ws_client.erl
+++ b/src/emqttd_ws_client.erl
@@ -104,7 +104,8 @@ init([WsPid, Req, ReplyChannel, PktOpts]) ->
     process_flag(trap_exit, true),
     {ok, Peername} = Req:get(peername),
     SendFun = fun(Payload) -> ReplyChannel({binary, Payload}) end,
-    ProtoState = emqttd_protocol:init(Peername, SendFun, PktOpts),
+    Cookie = Req:parse_cookie(),
+    ProtoState = emqttd_protocol:init(Peername, SendFun, [{ws_cookie, Cookie}|PktOpts]),
     {ok, #client_state{ws_pid = WsPid, request = Req, proto_state = ProtoState}}.
 
 handle_call(_Req, _From, State) ->