diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go
index a2ef2764b..19aa157cd 100644
--- a/cmd/tiller/tiller.go
+++ b/cmd/tiller/tiller.go
@@ -77,6 +77,7 @@ const (
 var (
 	grpcAddr      = flag.String("listen", fmt.Sprintf(":%v", environment.DefaultTillerPort), "address:port to listen on")
 	probeAddr     = flag.String("probe-listen", fmt.Sprintf(":%v", environment.DefaultTillerProbePort), "address:port to listen on for probes")
+	enableProbing = flag.Bool("probe", true, "enable probing over http")
 	enableTracing = flag.Bool("trace", false, "enable rpc tracing")
 	store         = flag.String("storage", storageConfigMap, "storage driver to use. One of 'configmap', 'memory', 'sql' or 'secret'")
 
@@ -205,7 +206,9 @@ func start() {
 
 	logger.Printf("Starting Tiller %s (tls=%t)", version.GetVersion(), *tlsEnable || *tlsVerify)
 	logger.Printf("GRPC listening on %s", *grpcAddr)
-	logger.Printf("Probes listening on %s", *probeAddr)
+	if *enableProbing {
+		logger.Printf("Probes listening on %s", *probeAddr)
+	}
 	logger.Printf("Storage driver is %s", env.Releases.Name())
 	logger.Printf("Max history per release is %d", *maxHistory)
 
@@ -225,6 +228,10 @@ func start() {
 	}()
 
 	go func() {
+		if !*enableProbing {
+			return
+		}
+
 		mux := newProbesMux()
 
 		// Register gRPC server to prometheus to initialized matrix