diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go
index 1c5ebbd..91ba088 100644
--- a/client/lib/rendezvous.go
+++ b/client/lib/rendezvous.go
@@ -79,7 +79,7 @@ func newBrokerChannelFromConfig(config ClientConfig) (*BrokerChannel, error) {
 	if config.UTLSClientID != "" {
 		utlsClientHelloID, err := utlsutil.NameToUTLSID(config.UTLSClientID)
 		if err != nil {
-			return nil, fmt.Errorf("unable to create broker channel: %v", err)
+			return nil, fmt.Errorf("unable to create broker channel: %w", err)
 		}
 		utlsConfig := &utls.Config{
 			RootCAs: certs.GetRootCAs(),
diff --git a/server/lib/http.go b/server/lib/http.go
index 1a765c2..403aeb1 100644
--- a/server/lib/http.go
+++ b/server/lib/http.go
@@ -147,7 +147,7 @@ func (handler *httpHandler) turbotunnelMode(conn net.Conn, addr net.Addr) error
 	var clientID turbotunnel.ClientID
 	_, err := io.ReadFull(conn, clientID[:])
 	if err != nil {
-		return fmt.Errorf("reading ClientID: %v", err)
+		return fmt.Errorf("reading ClientID: %w", err)
 	}
 
 	// Store a short-term mapping from the ClientID to the client IP