diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Flusher.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Flusher.java
index fdbb23a773e..78848c5279b 100644
--- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Flusher.java
+++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Flusher.java
@@ -300,13 +300,6 @@ public class HTTP2Flusher extends IteratingCallback
         terminate(x);
     }
 
-    @Override
-    public void close()
-    {
-        super.close();
-        iterate();
-    }
-
     private void terminate(Throwable x)
     {
         Queue<Entry> queued;
diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java
index 1f763d89b87..1852df83fb6 100644
--- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java
+++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java
@@ -355,10 +355,7 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
     @Override
     public void reset(ResetFrame frame, Callback callback)
     {
-        if (closed.get())
-            callback.succeeded();
-        else
-            control(getStream(frame.getStreamId()), frame, callback);
+        control(getStream(frame.getStreamId()), frame, callback);
     }
 
     @Override
@@ -662,7 +659,7 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
                 }
                 case GO_AWAY:
                 {
-                    disconnect();
+                    flusher.close();
                     break;
                 }
                 default: