diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9f1313..0227ee6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ The minor version will be incremented upon a breaking change and the patch versi
 
 ### Fixes
 
+- client: set max message size for decode ([#151](https://github.com/rpcpool/yellowstone-grpc/pull/151)).
+
 ### Breaking
 
 ## [yellowstone-grpc-proto-1.3.0+solana.1.16.1] - 2023-06-16
diff --git a/yellowstone-grpc-client/src/lib.rs b/yellowstone-grpc-client/src/lib.rs
index cad219a..8c5f792 100644
--- a/yellowstone-grpc-client/src/lib.rs
+++ b/yellowstone-grpc-client/src/lib.rs
@@ -96,7 +96,8 @@ impl GeyserGrpcClient<()> {
 
         Ok(GeyserGrpcClient {
             health: HealthClient::with_interceptor(channel.clone(), interceptor.clone()),
-            geyser: GeyserClient::with_interceptor(channel, interceptor),
+            geyser: GeyserClient::with_interceptor(channel, interceptor)
+                .max_decoding_message_size(16 * 1024 * 1024), // 16 MiB
         })
     }
 }