diff --git a/pkg/coordinator/coordinator.go b/pkg/coordinator/coordinator.go
index 66c37e8e2..c36016663 100644
--- a/pkg/coordinator/coordinator.go
+++ b/pkg/coordinator/coordinator.go
@@ -28,7 +28,7 @@ func New(conf config.CoordinatorConfig, log *logger.Logger) (services service.Gr
 	}
 	services.Add(hub, h)
 	if conf.Coordinator.Monitoring.IsEnabled() {
-		services.Add(monitoring.New(conf.Coordinator.Monitoring, conf.Coordinator.Server, h.GetHost(), log))
+		services.Add(monitoring.New(conf.Coordinator.Monitoring, h.GetHost(), log))
 	}
 	return
 }
diff --git a/pkg/coordinator/hub.go b/pkg/coordinator/hub.go
index 87794adef..6b418143f 100644
--- a/pkg/coordinator/hub.go
+++ b/pkg/coordinator/hub.go
@@ -89,7 +89,7 @@ func RequestToHandshake(data string) (*api.ConnectionRequest[com.Uid], error) {
 	}
 	handshake, err := api.UnwrapChecked[api.ConnectionRequest[com.Uid]](base64.URLEncoding.DecodeString(data))
 	if err != nil || handshake == nil {
-		return nil, fmt.Errorf("%v (%v)", err, handshake)
+		return nil, fmt.Errorf("%w (%v)", err, handshake)
 	}
 	return handshake, nil
 }
diff --git a/pkg/monitoring/monitoring.go b/pkg/monitoring/monitoring.go
index f70a50bb2..6ed7d3da6 100644
--- a/pkg/monitoring/monitoring.go
+++ b/pkg/monitoring/monitoring.go
@@ -23,7 +23,7 @@ type Monitoring struct {
 
 // New creates new monitoring service.
 // The tag param specifies owner label for logs.
-func New(conf config.Monitoring, servConf config.Server, baseAddr string, log *logger.Logger) *Monitoring {
+func New(conf config.Monitoring, baseAddr string, log *logger.Logger) *Monitoring {
 	serv, err := httpx.NewServer(
 		net.JoinHostPort(baseAddr, strconv.Itoa(conf.Port)),
 		func(s *httpx.Server) httpx.Handler {
@@ -52,7 +52,6 @@ func New(conf config.Monitoring, servConf config.Server, baseAddr string, log *l
 			return h
 		},
 		httpx.WithPortRoll(true),
-		httpx.WithServerConfig(servConf),
 		httpx.HttpsRedirect(false),
 		httpx.WithLogger(log),
 	)
diff --git a/pkg/network/httpx/server.go b/pkg/network/httpx/server.go
index 076f0683d..eb6e8c1e3 100644
--- a/pkg/network/httpx/server.go
+++ b/pkg/network/httpx/server.go
@@ -1,6 +1,7 @@
 package httpx
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -133,13 +134,12 @@ func (s *Server) run() {
 	} else {
 		err = s.Serve(*s.listener)
 	}
-	switch err {
-	case http.ErrServerClosed:
+
+	if errors.Is(err, http.ErrServerClosed) {
 		s.log.Debug().Msgf("%s server was closed", protocol)
 		return
-	default:
-		s.log.Error().Err(err)
 	}
+	s.log.Error().Err(err)
 }
 
 func (s *Server) Stop() error {
diff --git a/pkg/worker/worker.go b/pkg/worker/worker.go
index 20e6dab18..0af214cb3 100644
--- a/pkg/worker/worker.go
+++ b/pkg/worker/worker.go
@@ -48,7 +48,7 @@ func New(conf config.WorkerConfig, log *logger.Logger, done chan struct{}) (serv
 	}
 	services.Add(h)
 	if conf.Worker.Monitoring.IsEnabled() {
-		services.Add(monitoring.New(conf.Worker.Monitoring, conf.Worker.Server, h.GetHost(), log))
+		services.Add(monitoring.New(conf.Worker.Monitoring, h.GetHost(), log))
 	}
 	st, err := GetCloudStorage(conf.Storage.Provider, conf.Storage.Key)
 	if err != nil {