diff --git a/changelog.d/12358.misc b/changelog.d/12358.misc
new file mode 100644
index 000000000000..fcacbcba5cf7
--- /dev/null
+++ b/changelog.d/12358.misc
@@ -0,0 +1 @@
+Fix a long-standing bug where `Linearizer`s could get stuck if a cancellation were to happen at the wrong time.