diff --git a/client/client.go b/client/client.go
index b77bf6107..680fbd9af 100644
--- a/client/client.go
+++ b/client/client.go
@@ -2039,15 +2039,14 @@ func (c *Client) emitHostStats() {
 	c.setGaugeForUptime(hStats)
 	c.setGaugeForCPUStats(nodeID, hStats)
 	c.setGaugeForDiskStats(nodeID, hStats)
-
-	// TODO: This should be moved to emitClientMetrics
-	c.setGaugeForAllocationStats(nodeID)
 }
 
 // emitClientMetrics emits lower volume client metrics
 func (c *Client) emitClientMetrics() {
 	nodeID := c.NodeID()
 
+	c.setGaugeForAllocationStats(nodeID)
+
 	// Emit allocation metrics
 	blocked, migrating, pending, running, terminal := 0, 0, 0, 0, 0
 	for _, ar := range c.getAllocRunners() {