diff --git a/metrics/timer.go b/metrics/timer.go
index 2e1a9be47..4fcc297d2 100644
--- a/metrics/timer.go
+++ b/metrics/timer.go
@@ -225,20 +225,18 @@ func (t *StandardTimer) Time(f func()) {
 	t.Update(time.Since(ts))
 }
 
-// Record the duration of an event.
+// Record the duration of an event, in nanoseconds.
 func (t *StandardTimer) Update(d time.Duration) {
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
-	t.histogram.Update(int64(d))
+	t.histogram.Update(d.Nanoseconds())
 	t.meter.Mark(1)
 }
 
 // Record the duration of an event that started at a time and ends now.
+// The record uses nanoseconds.
 func (t *StandardTimer) UpdateSince(ts time.Time) {
-	t.mutex.Lock()
-	defer t.mutex.Unlock()
-	t.histogram.Update(int64(time.Since(ts)))
-	t.meter.Mark(1)
+	t.Update(time.Since(ts))
 }
 
 // Variance returns the variance of the values in the sample.
diff --git a/rpc/metrics.go b/rpc/metrics.go
index 2a87db94c..e44e8d76e 100644
--- a/rpc/metrics.go
+++ b/rpc/metrics.go
@@ -46,7 +46,7 @@ func updateServeTimeHistogram(method string, success bool, elapsed time.Duration
 			metrics.NewExpDecaySample(1028, 0.015),
 		)
 	}
-	metrics.GetOrRegisterHistogramLazy(h, nil, sampler).Update(elapsed.Microseconds())
+	metrics.GetOrRegisterHistogramLazy(h, nil, sampler).Update(elapsed.Nanoseconds())
 }
 
 func newRPCRequestGauge(method string) metrics.Gauge {