diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
index 72b4b10ed..dab771696 100644
--- a/packages/grpc-js/package.json
+++ b/packages/grpc-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.6.10",
+  "version": "1.6.11",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
   "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
diff --git a/packages/grpc-js/src/call-stream.ts b/packages/grpc-js/src/call-stream.ts
index c405405e8..0bb4d01cb 100644
--- a/packages/grpc-js/src/call-stream.ts
+++ b/packages/grpc-js/src/call-stream.ts
@@ -488,7 +488,11 @@ export class Http2CallStream implements Call {
     }
     let details = '';
     if (typeof metadataMap['grpc-message'] === 'string') {
-      details = decodeURI(metadataMap['grpc-message']);
+      try {
+        details = decodeURI(metadataMap['grpc-message']);
+      } catch (e) {
+        details = metadataMap['grpc-messages'] as string;
+      }
       metadata.remove('grpc-message');
       this.trace(
         'received status details string "' + details + '" from server'