diff --git a/app/websocket_router.go b/app/websocket_router.go
index 80773eb9d5..a189fb7901 100644
--- a/app/websocket_router.go
+++ b/app/websocket_router.go
@@ -42,6 +42,10 @@ func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketReque
 	}
 
 	if r.Action == model.WEBSOCKET_AUTHENTICATION_CHALLENGE {
+		if conn.SessionToken != "" {
+			return
+		}
+
 		token, ok := r.Data["token"].(string)
 		if !ok {
 			conn.WebSocket.Close()