diff --git a/src/stream.c b/src/stream.c
index 3047fe8..21c4f12 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -3737,12 +3737,18 @@
 
 	ptr = (void *)strtoul(args[2], NULL, 0);
 
+	thread_isolate();
+
 	/* first, look for the requested stream in the stream table */
 	list_for_each_entry(strm, &streams, list) {
-		if (strm == ptr)
+		if (strm == ptr) {
+			stream_shutdown(strm, SF_ERR_KILLED);
 			break;
+		}
 	}
 
+	thread_release();
+
 	/* do we have the stream ? */
 	if (strm != ptr) {
 		appctx->ctx.cli.severity = LOG_ERR;
@@ -3751,7 +3757,6 @@
 		return 1;
 	}
 
-	stream_shutdown(strm, SF_ERR_KILLED);
 	return 1;
 }