--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseSubscribers.java	Mon Dec 04 16:54:26 2017 +0000
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseSubscribers.java	Tue Dec 05 10:07:50 2017 +0000
@@ -447,10 +447,14 @@
                 subscription = null;
             }
             // s will be null if already completed
-            if (s != null) {
-                 s.cancel();
+            try {
+                if (s != null) {
+                    s.cancel();
+                }
+            } finally {
+                buffers.offer(LAST_LIST);
+                super.close();
             }
-            super.close();
         }
 
     }