diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc
index f00049a1..0400b61b 100644
--- a/src/hydra-queue-runner/hydra-queue-runner.cc
+++ b/src/hydra-queue-runner/hydra-queue-runner.cc
@@ -49,20 +49,12 @@ State::State(std::optional<std::string> metricsAddrOpt)
     , rootsDir(config->getStrOption("gc_roots_dir", fmt("%s/gcroots/per-user/%s/hydra-roots", settings.nixStateDir, getEnvOrDie("LOGNAME"))))
     , metricsAddr(config->getStrOption("queue_runner_metrics_address", std::string{"127.0.0.1:9198"}))
     , registry(std::make_shared<prometheus::Registry>())
-    // , call_ctr_family(prometheus::BuildCounter().Name("queue_queued_builds_calls_total").Help("Number of times State::getQueuedBuilds() was called").Register(*registry))
-    // , call_ctr(call_ctr_family.Add({}))
+    , call_ctr(prometheus::BuildCounter()
+                             .Name("queue_queued_builds_calls_total")
+                             .Help("Number of times State::getQueuedBuilds() was called")
+                             .Register(*registry))
+    , queue_queued_builds_calls(call_ctr.Add({})) // FIXME: add the proper arguments
 {
-    // call_ctr_family(prometheus::BuildCounter().Name("queue_queued_builds_calls_total").Help("Number of times State::getQueuedBuilds() was called").Register(*registry));
-    // call_ctr(call_ctr_family.Add({}));
-    auto& fam = prometheus::BuildCounter()
-        .Name("queue_queued_builds_calls_total")
-        .Help("Number of times State::getQueuedBuilds() was called")
-        .Register(*registry)
-        .Add({});
-
-    // call_ctr_family(fam);
-    // call_ctr(call_ctr_family.Add({}));
-
     hydraData = getEnvOrDie("HYDRA_DATA");
 
     logDir = canonPath(hydraData + "/build-logs");
diff --git a/src/hydra-queue-runner/queue-monitor.cc b/src/hydra-queue-runner/queue-monitor.cc
index 8fb06f45..bcef4e2f 100644
--- a/src/hydra-queue-runner/queue-monitor.cc
+++ b/src/hydra-queue-runner/queue-monitor.cc
@@ -82,7 +82,7 @@ struct PreviousFailure : public std::exception {
 bool State::getQueuedBuilds(Connection & conn,
     ref<Store> destStore, unsigned int & lastBuildId)
 {
-    call_ctr.Increment();
+    queue_queued_builds_calls.Increment();
 
     printInfo("checking the queue for builds > %d...", lastBuildId);
 
diff --git a/src/hydra-queue-runner/state.hh b/src/hydra-queue-runner/state.hh
index 9e89df52..56e01a0e 100644
--- a/src/hydra-queue-runner/state.hh
+++ b/src/hydra-queue-runner/state.hh
@@ -439,8 +439,8 @@ private:
 
     std::shared_ptr<prometheus::Registry> registry;
 
-    // prometheus::Family<prometheus::Counter>& call_ctr_family;
-    prometheus::Counter& call_ctr;
+    prometheus::Family<prometheus::Counter>& call_ctr;
+    prometheus::Counter& queue_queued_builds_calls;
 
 public:
     State(std::optional<std::string> metricsAddrOpt);