diff --git a/waku/node/peer_manager/peer_manager.nim b/waku/node/peer_manager/peer_manager.nim
index d4c234cf7..eef965983 100644
--- a/waku/node/peer_manager/peer_manager.nim
+++ b/waku/node/peer_manager/peer_manager.nim
@@ -42,7 +42,9 @@ declarePublicGauge waku_peer_store_size, "Number of peers managed by the peer st
 declarePublicGauge waku_service_peers,
   "Service peer protocol and multiaddress ", labels = ["protocol", "peerId"]
 declarePublicGauge waku_total_unique_peers, "total number of unique peers"
-
+declarePublicGauge waku_light_clients_inbound_connections,
+  "Number of light protocol clients with inbound connections",
+  labels = ["protocol", "shard"]
 logScope:
   topics = "waku node peer_manager"
 
diff --git a/waku/waku_relay/protocol.nim b/waku/waku_relay/protocol.nim
index c87519b06..f6223bb63 100644
--- a/waku/waku_relay/protocol.nim
+++ b/waku/waku_relay/protocol.nim
@@ -26,6 +26,12 @@ export WakuRelayCodec
 logScope:
   topics = "waku relay"
 
+declarePublicGauge(
+  waku_relay_messages_per_shard,
+  "number of unique messages seen, grouped by shard",
+  labels = ["shard"],
+)
+
 # see: https://github.com/libp2p/specs/blob/master/pubsub/gossipsub/gossipsub-v1.1.md#overview-of-new-parameters
 const TopicParameters = TopicParams(
   topicWeight: 1,
@@ -196,6 +202,8 @@ proc logMessageInfo*(
       sentTime = getNowInNanosecondTime(),
       payloadSizeBytes = msg.payload.len
 
+  waku_relay_messages_per_shard.inc(labelValues = [topic])
+
 proc initRelayObservers(w: WakuRelay) =
   proc decodeRpcMessageInfo(
       peer: PubSubPeer, msg: Message
diff --git a/waku/waku_rln_relay/protocol_metrics.nim b/waku/waku_rln_relay/protocol_metrics.nim
index 6764cc21f..55bafc1fa 100644
--- a/waku/waku_rln_relay/protocol_metrics.nim
+++ b/waku/waku_rln_relay/protocol_metrics.nim
@@ -20,12 +20,6 @@ declarePublicCounter(
   waku_rln_messages_total, "number of messages seen by the rln relay"
 )
 
-declarePublicGauge(
-  waku_rln_messages_per_shard,
-  "number of unique messages seen, grouped by shard",
-  labels = ["shard"],
-)
-
 declarePublicCounter(waku_rln_spam_messages_total, "number of spam messages detected")
 declarePublicCounter(
   waku_rln_invalid_messages_total, "number of invalid messages detected", ["type"]
diff --git a/waku/waku_rln_relay/rln_relay.nim b/waku/waku_rln_relay/rln_relay.nim
index 1cc21d2c0..965c8c021 100644
--- a/waku/waku_rln_relay/rln_relay.nim
+++ b/waku/waku_rln_relay/rln_relay.nim
@@ -213,9 +213,6 @@ proc validateMessage*(
   # track message count for metrics
   waku_rln_messages_total.inc()
 
-  let shard = msg.contentTopic
-  waku_rln_messages_per_shard.inc(labelValues = [$shard])
-
   # checks if the message's timestamp is within acceptable range
   let currentTime = getTime().toUnixFloat()
   let messageTime = msg.timestamp.float64 / 1e9