diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go
index 96eeddacb..185bf4b6c 100644
--- a/cmd/tiller/tiller.go
+++ b/cmd/tiller/tiller.go
@@ -161,6 +161,9 @@ func start() {
 			MaxConnectionIdle: 10 * time.Minute,
 			// If needed, we can configure the max connection age
 		}))
+		opts = append(opts, grpc.KeepaliveEnforcementPolicy(keepalive.EnforcementPolicy{
+			MinTime: time.Duration(20) * time.Second, // For compatibility with the client keepalive.ClientParameters
+		}))
 	}
 
 	rootServer = tiller.NewServer(opts...)