diff --git a/cmd/apiary.go b/cmd/apiary.go
index df833f8..cc60b39 100644
--- a/cmd/apiary.go
+++ b/cmd/apiary.go
@@ -82,6 +82,8 @@ func ActionServe(c *cli.Context) error {
 		return fmt.Errorf("Invalid store configured")
 	}
 
+	s = store.NewMetricsCollectingStore(s)
+
 	// Setup honeypot
 	hs, err := ssh.NewHoneypotServer(cfg.Honeypot, s)
 	if err != nil {