diff --git a/common/client-core/Cargo.toml b/common/client-core/Cargo.toml
index 124611d348..ae452c3e9b 100644
--- a/common/client-core/Cargo.toml
+++ b/common/client-core/Cargo.toml
@@ -118,3 +118,4 @@ default = []
 cli = ["clap"]
 fs-surb-storage = ["sqlx"]
 wasm = ["nym-gateway-client/wasm"]
+metrics-server = []
diff --git a/common/client-core/src/client/packet_statistics_control.rs b/common/client-core/src/client/packet_statistics_control.rs
index a1173bec66..63c081a509 100644
--- a/common/client-core/src/client/packet_statistics_control.rs
+++ b/common/client-core/src/client/packet_statistics_control.rs
@@ -22,6 +22,7 @@ use hyper_util::rt::TokioIo;
 #[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
 use std::convert::Infallible;
 #[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
+#[cfg(feature = "metrics-server")]
 use std::net::SocketAddr;
 #[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
 use tokio::net::TcpListener;
@@ -507,8 +508,8 @@ impl PacketStatisticsControl {
         cfg_if::cfg_if! {
             if #[cfg(all(target_arch = "wasm32", target_os = "unknown"))] {
                 log::warn!("Metrics server is not supported on wasm32-unknown-unknown");
-                let listener: Option<WasmEmpty> = None;
-            } else {
+                let listener = None;
+            } else if #[cfg(feature = "metrics-server")] {
                 let mut metrics_port = 18000;
                 let listener: Option<TcpListener>;
                 loop {
@@ -527,7 +528,9 @@ impl PacketStatisticsControl {
                         }
                     };
                 }
-
+            } else {
+                log::info!("Metrics server is disabled!");
+                let listener: Option<TcpListener> = None;
             }
         }