diff --git a/.github/workflows/test-lang-js.yml b/.github/workflows/test-lang-js.yml
index 1f5bebce252..3b28dd7979d 100644
--- a/.github/workflows/test-lang-js.yml
+++ b/.github/workflows/test-lang-js.yml
@@ -37,6 +37,7 @@ jobs:
         node:
         - 12
         - 14
+        - 16
     steps:
       - uses: actions/checkout@v2
       - name: Setup Node
@@ -65,6 +66,7 @@ jobs:
         node:
         - 12
         - 14
+        - 16
     steps:
       - uses: actions/checkout@v2
       - name: Setup Node
diff --git a/lang/js/lib/protocols.js b/lang/js/lib/protocols.js
index 7a5b9dea77e..f34736230d1 100644
--- a/lang/js/lib/protocols.js
+++ b/lang/js/lib/protocols.js
@@ -1099,6 +1099,8 @@ MessageDecoder.prototype._flush = function () {
     this.emit('error', new Error('trailing data'));
   } else if (this._empty) {
     this.emit('error', new Error('no message decoded'));
+  } else {
+    this.emit('finish');
   }
 };