diff --git a/lib/nghttp2_session.c b/lib/nghttp2_session.c
index b2a00a49..1ddf2f0e 100644
--- a/lib/nghttp2_session.c
+++ b/lib/nghttp2_session.c
@@ -2031,6 +2031,8 @@ static int session_after_frame_sent(nghttp2_session *session)
         /* Fall through */
       case NGHTTP2_HCAT_RESPONSE:
         stream->state = NGHTTP2_STREAM_OPENED;
+        /* Fall through */
+      case NGHTTP2_HCAT_HEADERS:
         if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
           nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_WR);
         }
@@ -2050,15 +2052,6 @@ static int session_after_frame_sent(nghttp2_session *session)
              DATA frame item.  We might have to handle it here. */
         }
         break;
-      case NGHTTP2_HCAT_HEADERS:
-        if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-          nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_WR);
-        }
-        rv = nghttp2_session_close_stream_if_shut_rdwr(session, stream);
-        if(nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-        break;
       }
       break;
     }