diff --git a/src/shared/util.js b/src/shared/util.js
index 22d70f5e8..a93216101 100644
--- a/src/shared/util.js
+++ b/src/shared/util.js
@@ -1438,6 +1438,9 @@ MessageHandler.prototype = {
 
     let streamSink = {
       enqueue(chunk, size = 1) {
+        if (this.isCancelled) {
+          return;
+        }
         let lastDesiredSize = this.desiredSize;
         this.desiredSize -= size;
         // Enqueue decreases the desiredSize property of sink,
@@ -1451,6 +1454,9 @@ MessageHandler.prototype = {
       },
 
       close() {
+        if (this.isCancelled) {
+          return;
+        }
         sendStreamRequest({ stream: 'close', });
         delete self.streamSinks[streamId];
       },
@@ -1462,6 +1468,7 @@ MessageHandler.prototype = {
       sinkCapability: capability,
       onPull: null,
       onCancel: null,
+      isCancelled: false,
       desiredSize,
       ready: null,
     };
@@ -1564,6 +1571,8 @@ MessageHandler.prototype = {
           sendStreamResponse({ stream: 'cancel_complete',
                                success: false, reason, });
         });
+        this.streamSinks[data.streamId].sinkCapability.reject(data.reason);
+        this.streamSinks[data.streamId].isCancelled = true;
         delete this.streamSinks[data.streamId];
         break;
       default:
diff --git a/test/unit/util_stream_spec.js b/test/unit/util_stream_spec.js
index 285ec1f9c..d0b2b92e3 100644
--- a/test/unit/util_stream_spec.js
+++ b/test/unit/util_stream_spec.js
@@ -154,7 +154,7 @@ describe('util_stream', function () {
         expect(log).toEqual('01p2');
         return reader.cancel();
       }).then(() => {
-        expect(log).toEqual('01p2c');
+        expect(log).toEqual('01p2c4');
         done();
       });
     });