diff --git a/test/parallel/test-http2-server-shutdown-redundant.js b/test/parallel/test-http2-server-shutdown-redundant.js
new file mode 100644
index 00000000000000..708be0868c2f9e
--- /dev/null
+++ b/test/parallel/test-http2-server-shutdown-redundant.js
@@ -0,0 +1,29 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+const assert = require('assert');
+const http2 = require('http2');
+
+const server = http2.createServer();
+
+// Test blank return when a stream.session.shutdown is called twice
+// Also tests stream.session.shutdown with just a callback function (no options)
+server.on('stream', common.mustCall((stream) => {
+  stream.session.shutdown(common.mustCall(() => {
+    assert.strictEqual(
+      stream.session.shutdown(common.mustNotCall()),
+      undefined
+    );
+  }));
+  stream.session.shutdown(common.mustNotCall());
+}));
+
+server.listen(0, common.mustCall(() => {
+  const client = http2.connect(`http://localhost:${server.address().port}`);
+
+  const req = client.request();
+  req.resume();
+  req.on('end', common.mustCall(() => server.close()));
+}));