diff --git a/changelog/unreleased/supervisor-stop-routine.md b/changelog/unreleased/supervisor-stop-routine.md
new file mode 100644
index 000000000..7c4ecb2b8
--- /dev/null
+++ b/changelog/unreleased/supervisor-stop-routine.md
@@ -0,0 +1,5 @@
+Enhancement: Correct shutdown of services under runtime
+
+Supervised goroutines now shut themselves down on context cancellation propagation.
+
+https://github.com/owncloud/ocis/pull/2843