diff --git a/websocket/client.go b/websocket/client.go
index fdccd8a5..c82f244d 100644
--- a/websocket/client.go
+++ b/websocket/client.go
@@ -29,7 +29,7 @@ const (
 	pingPeriod = (pongWait * 9) / 10
 
 	// Maximum message size allowed from peer.
-	maxMessageSize = 1024
+	maxMessageSize = 16384 // 16 KB
 )
 
 type HandleWebsocketMessage func([]byte) error
diff --git a/websocket/util.go b/websocket/util.go
index bd0ad6de..bb173014 100644
--- a/websocket/util.go
+++ b/websocket/util.go
@@ -113,8 +113,11 @@ func (w *Reader) Start() error {
 
 func (w *Reader) printWebsocketToConsole() {
 	defer w.Stop()
+	w.writeMux.Lock()
+	w.conn.SetReadLimit(maxMessageSize)
 	w.conn.SetReadDeadline(time.Now().Add(pongWait))
 	w.conn.SetPongHandler(func(string) error { w.conn.SetReadDeadline(time.Now().Add(pongWait)); return nil })
+	w.writeMux.Unlock()
 	for {
 		_, message, err := w.conn.ReadMessage()
 		if err != nil {