diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index 9438bf92d34ee2..0844604d960258 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -671,7 +671,7 @@ Readable.prototype.unpipe = function(dest) {
   if (index === -1)
     return this;
 
-  state.pipes.splice(i, 1);
+  state.pipes.splice(index, 1);
   state.pipesCount -= 1;
   if (state.pipesCount === 1)
     state.pipes = state.pipes[0];
diff --git a/test/parallel/test-stream-pipe-unpipe-streams.js b/test/parallel/test-stream-pipe-unpipe-streams.js
new file mode 100644
index 00000000000000..c51c100d0f6802
--- /dev/null
+++ b/test/parallel/test-stream-pipe-unpipe-streams.js
@@ -0,0 +1,30 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+
+const { Readable, Writable } = require('stream');
+
+const source = Readable({read: () => {}});
+const dest1 = Writable({write: () => {}});
+const dest2 = Writable({write: () => {}});
+
+source.pipe(dest1);
+source.pipe(dest2);
+
+dest1.on('unpipe', common.mustCall(() => {}));
+dest2.on('unpipe', common.mustCall(() => {}));
+
+assert.strictEqual(source._readableState.pipes[0], dest1);
+assert.strictEqual(source._readableState.pipes[1], dest2);
+assert.strictEqual(source._readableState.pipes.length, 2);
+
+// Should be able to unpipe them in the reverse order that they were piped.
+
+source.unpipe(dest2);
+
+assert.strictEqual(source._readableState.pipes, dest1);
+assert.notStrictEqual(source._readableState.pipes, dest2);
+
+source.unpipe(dest1);
+
+assert.strictEqual(source._readableState.pipes, null);