diff --git a/cmd/api/handler/websocket/channel.go b/cmd/api/handler/websocket/channel.go
index 1831240c..01a63546 100644
--- a/cmd/api/handler/websocket/channel.go
+++ b/cmd/api/handler/websocket/channel.go
@@ -91,6 +91,10 @@ func (channel *Channel[I, M]) waitMessage(ctx context.Context) {
 			if !ok {
 				return
 			}
+			if msg == nil {
+				log.Warn().Str("channel", channel.storageChannelName).Msg("nil message")
+				continue
+			}
 			if msg.Channel != channel.storageChannelName {
 				channel.log.Error().
 					Str("msg", msg.Channel).