diff --git a/server/internal/websocket/manager.go b/server/internal/websocket/manager.go
index 0f7baafd..9fc21f60 100644
--- a/server/internal/websocket/manager.go
+++ b/server/internal/websocket/manager.go
@@ -276,7 +276,9 @@ func (manager *WebSocketManagerCtx) connect(connection *websocket.Conn, r *http.
 
 	e, ok := err.(*websocket.CloseError)
 	if !ok {
-		err = errors.Unwrap(err) // unwrap if possible
+		if e := errors.Unwrap(err); e != nil {
+			err = e // unwrap if possible
+		}
 		logger.Warn().Err(err).Msg("read message error")
 		// client is expected to reconnect soon
 		delayedDisconnect = true
diff --git a/server/internal/websocket/peer.go b/server/internal/websocket/peer.go
index 3861e3a0..0c2fd553 100644
--- a/server/internal/websocket/peer.go
+++ b/server/internal/websocket/peer.go
@@ -43,7 +43,9 @@ func (peer *WebSocketPeerCtx) Send(event string, payload any) {
 	})
 
 	if err != nil {
-		err = errors.Unwrap(err) // unwrap if possible
+		if e := errors.Unwrap(err); e != nil {
+			err = e // unwrap if possible
+		}
 		peer.logger.Warn().Err(err).Str("event", event).Msg("send message error")
 		return
 	}