diff --git a/app/cluster_handlers.go b/app/cluster_handlers.go
index e3661563a6..f14b51903c 100644
--- a/app/cluster_handlers.go
+++ b/app/cluster_handlers.go
@@ -31,6 +31,9 @@ func (a *App) registerAllClusterMessageHandlers() {
 
 func (a *App) clusterPublishHandler(msg *model.ClusterMessage) {
 	event := model.WebSocketEventFromJson(strings.NewReader(msg.Data))
+	if event == nil {
+		return
+	}
 	a.PublishSkipClusterSend(event)
 }
 
diff --git a/model/websocket_client.go b/model/websocket_client.go
index 72b162c3fb..619b469a4c 100644
--- a/model/websocket_client.go
+++ b/model/websocket_client.go
@@ -128,6 +128,9 @@ func (wsc *WebSocketClient) Listen() {
 			}
 
 			event := WebSocketEventFromJson(bytes.NewReader(rawMsg))
+			if event == nil {
+				continue
+			}
 			if event.IsValid() {
 				wsc.EventChannel <- event
 				continue