diff --git a/build.gradle b/build.gradle
index 614f96b9..898cab0f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ group = 'io.emeraldpay.dshackle'
 // Version schema:
 //    x.x.x for production, following SemVer model
 //    x.x.x-SNAPSHOT for development
-version = '0.15.0-SNAPSHOT'
+version = '0.16.0-SNAPSHOT'
 
 java {
     sourceCompatibility = JavaVersion.VERSION_13
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/GrpcServer.kt b/src/main/kotlin/io/emeraldpay/dshackle/GrpcServer.kt
index 8923263a..7c9e1e53 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/GrpcServer.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/GrpcServer.kt
@@ -46,6 +46,7 @@ open class GrpcServer(
         log.info("Listening Native gRPC on ${mainConfig.host}:${mainConfig.port}")
         val serverBuilder = NettyServerBuilder
             .forAddress(InetSocketAddress(mainConfig.host, mainConfig.port))
+            .maxInboundMessageSize(Int.MAX_VALUE)
             .let {
                 if (mainConfig.accessLogConfig.enabled) {
                     it.intercept(accessHandler)
@@ -65,7 +66,7 @@ open class GrpcServer(
         val server = serverBuilder.build()
         this.server = server
 
-        Thread { server.start() }.run()
+        server.start()
         log.info("GRPC Server started")
     }