diff --git a/owrx/client.py b/owrx/client.py
index 6241a01..f992e45 100644
--- a/owrx/client.py
+++ b/owrx/client.py
@@ -1,5 +1,4 @@
 from owrx.config import Config
-from owrx.metrics import Metrics, DirectMetric
 import threading
 
 import logging
@@ -24,7 +23,6 @@ class ClientRegistry(object):
 
     def __init__(self):
         self.clients = []
-        Metrics.getSharedInstance().addMetric("openwebrx.users", DirectMetric(self.clientCount))
         super().__init__()
 
     def broadcast(self):
diff --git a/owrx/metrics.py b/owrx/metrics.py
index 7055449..48e0db0 100644
--- a/owrx/metrics.py
+++ b/owrx/metrics.py
@@ -1,4 +1,5 @@
 import threading
+from owrx.client import ClientRegistry
 
 
 class Metric(object):
@@ -38,6 +39,7 @@ class Metrics(object):
 
     def __init__(self):
         self.metrics = {}
+        self.addMetric("openwebrx.users", DirectMetric(ClientRegistry.getSharedInstance().clientCount))
 
     def addMetric(self, name, metric):
         self.metrics[name] = metric