diff --git a/etcdserver/api/v3rpc/grpc.go b/etcdserver/api/v3rpc/grpc.go
index 88174e3bac24..ba0d331e8b75 100644
--- a/etcdserver/api/v3rpc/grpc.go
+++ b/etcdserver/api/v3rpc/grpc.go
@@ -24,6 +24,8 @@ import (
 	"google.golang.org/grpc/grpclog"
 )
 
+const grpcOverheadBytes = 512 * 1024
+
 func init() {
 	grpclog.SetLogger(plog)
 }
@@ -36,8 +38,9 @@ func Server(s *etcdserver.EtcdServer, tls *tls.Config) *grpc.Server {
 	}
 	opts = append(opts, grpc.UnaryInterceptor(newUnaryInterceptor(s)))
 	opts = append(opts, grpc.StreamInterceptor(newStreamInterceptor(s)))
-
+	opts = append(opts, grpc.MaxMsgSize(int(s.Cfg.MaxRequestBytes+grpcOverheadBytes)))
 	grpcServer := grpc.NewServer(opts...)
+
 	pb.RegisterKVServer(grpcServer, NewQuotaKVServer(s))
 	pb.RegisterWatchServer(grpcServer, NewWatchServer(s))
 	pb.RegisterLeaseServer(grpcServer, NewQuotaLeaseServer(s))
diff --git a/integration/cluster.go b/integration/cluster.go
index ab66ab0c0f62..a19003935404 100644
--- a/integration/cluster.go
+++ b/integration/cluster.go
@@ -61,8 +61,6 @@ const (
 	basePort     = 21000
 	UrlScheme    = "unix"
 	UrlSchemeTLS = "unixs"
-
-	defaultMaxRequestSize
 )
 
 var (