diff --git a/pkg/tiller/server.go b/pkg/tiller/server.go
index 57826578e..95276018e 100644
--- a/pkg/tiller/server.go
+++ b/pkg/tiller/server.go
@@ -36,7 +36,8 @@ var maxMsgSize = 1024 * 1024 * 20
 // DefaultServerOpts returns the set of default grpc ServerOption's that Tiller requires.
 func DefaultServerOpts() []grpc.ServerOption {
 	return []grpc.ServerOption{
-		grpc.MaxMsgSize(maxMsgSize),
+		grpc.MaxRecvMsgSize(maxMsgSize),
+		grpc.MaxSendMsgSize(maxMsgSize),
 		grpc.UnaryInterceptor(newUnaryInterceptor()),
 		grpc.StreamInterceptor(newStreamInterceptor()),
 	}