diff --git a/tunnels/client/http2/http2_client.c b/tunnels/client/http2/http2_client.c
index 6fa3a07d..04492644 100644
--- a/tunnels/client/http2/http2_client.c
+++ b/tunnels/client/http2/http2_client.c
@@ -388,6 +388,7 @@ static void doHttp2Action(const http2_action_t action, http2_client_con_state_t
     case kActionStreamFinish: {
         context_t *fc   = newFinContext(stream->line);
         tunnel_t  *dest = stream->tunnel->dw;
+        nghttp2_session_set_stream_user_data(con->session, stream->stream_id, NULL);
         removeStream(con, stream);
         deleteHttp2Stream(stream);
         dest->downStream(dest, fc);
diff --git a/tunnels/server/http2/http2_server.c b/tunnels/server/http2/http2_server.c
index 4364b47a..b034fe47 100644
--- a/tunnels/server/http2/http2_server.c
+++ b/tunnels/server/http2/http2_server.c
@@ -381,6 +381,7 @@ static void doHttp2Action(const http2_action_t action, http2_server_con_state_t
     case kActionStreamFinish: {
         context_t *fc   = newFinContext(stream->line);
         tunnel_t  *dest = stream->tunnel->up;
+        nghttp2_session_set_stream_user_data(con->session, stream->stream_id, NULL);
         removeStream(con, stream);
         deleteHttp2Stream(stream);
         dest->upStream(dest, fc);