diff --git a/src/conn_stream.c b/src/conn_stream.c
index c721083ac..29bf49b05 100644
--- a/src/conn_stream.c
+++ b/src/conn_stream.c
@@ -476,8 +476,13 @@ void cs_applet_shut(struct conn_stream *cs)
 {
 	struct appctx *appctx = __cs_appctx(cs);
 
-	if (appctx->applet->release && !cs_state_in(cs->state, CS_SB_DIS|CS_SB_CLO))
+	if (cs->endp->flags & (CS_EP_SHR|CS_EP_SHW))
+		return;
+
+	if (appctx->applet->release)
 		appctx->applet->release(appctx);
+
+	cs->endp->flags |= CS_EP_SHRR | CS_EP_SHWN;
 }
 
 /*