diff --git a/go/vt/servenv/grpc_server.go b/go/vt/servenv/grpc_server.go
index 3b3d7659d61..c641156f54c 100644
--- a/go/vt/servenv/grpc_server.go
+++ b/go/vt/servenv/grpc_server.go
@@ -219,15 +219,16 @@ func interceptors() []grpc.ServerOption {
 }
 
 func serveGRPC() {
-	if *grpccommon.EnableGRPCPrometheus {
-		grpc_prometheus.Register(GRPCServer)
-		grpc_prometheus.EnableHandlingTimeHistogram()
-	}
 	// skip if not registered
 	if GRPCPort == nil || *GRPCPort == 0 {
 		return
 	}
 
+	if *grpccommon.EnableGRPCPrometheus {
+		grpc_prometheus.Register(GRPCServer)
+		grpc_prometheus.EnableHandlingTimeHistogram()
+	}
+
 	// register reflection to support list calls :)
 	reflection.Register(GRPCServer)