diff --git a/glide.lock b/glide.lock
index eeb7f93..a24c5bf 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 75d6a3df632303b99ef9ccb5de5579224ebf9b95a57dedce4ba025e4ddb57975
-updated: 2017-08-10T14:31:39.777897975+02:00
+hash: aca80589471bc26fa1a5c269dc898aa77c321a139fa8840c6fa6f60c1a39ebaa
+updated: 2017-08-10T16:23:01.727876332+02:00
 imports:
 - name: github.com/beorn7/perks
   version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
@@ -27,7 +27,7 @@ imports:
   subpackages:
   - pbutil
 - name: github.com/piotrkowalczuk/promgrpc
-  version: e5b307a59e982be97c256877d17d0302a1c190b1
+  version: e748861bd4ef1da47b1c411947053dca645b4998
 - name: github.com/pmezard/go-difflib
   version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
   subpackages:
diff --git a/glide.yaml b/glide.yaml
index ef5c8bd..9f52780 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -31,7 +31,7 @@ import:
   - metadata
   - peer
 - package: github.com/piotrkowalczuk/promgrpc
-  version: ~0.7.0
+  version: ~0.8.0
 - package: go.uber.org/zap
   version: ^1.3.0
 testImport:
diff --git a/mnemosyned/daemon.go b/mnemosyned/daemon.go
index 6190b8a..70a1d2b 100644
--- a/mnemosyned/daemon.go
+++ b/mnemosyned/daemon.go
@@ -138,15 +138,7 @@ func (d *Daemon) Run() (err error) {
 		return
 	}
 
-	interceptor := promgrpc.NewInterceptor(promgrpc.InterceptorOpts{
-		SkipPreallocate: d.opts.IsTest,
-		Registerer: func() prometheus.Registerer {
-			if d.opts.IsTest {
-				return prometheus.NewRegistry()
-			}
-			return prometheus.DefaultRegisterer
-		}(),
-	})
+	interceptor := promgrpc.NewInterceptor(promgrpc.InterceptorOpts{})
 
 	d.clientOptions = []grpc.DialOption{
 		grpc.WithTimeout(10 * time.Second),
@@ -193,7 +185,10 @@ func (d *Daemon) Run() (err error) {
 		return err
 	}
 	mnemosynerpc.RegisterSessionManagerServer(gRPCServer, mnemosyneServer)
-	promgrpc.RegisterInterceptor(gRPCServer, interceptor)
+	if !d.opts.IsTest {
+		prometheus.DefaultRegisterer.Register(interceptor)
+		promgrpc.RegisterInterceptor(gRPCServer, interceptor)
+	}
 
 	if err = cl.Connect(d.clientOptions...); err != nil {
 		return err