diff --git a/changelog/unreleased/stop-supervisor-if-failure.md b/changelog/unreleased/stop-supervisor-if-failure.md
new file mode 100644
index 000000000..8bccf7a53
--- /dev/null
+++ b/changelog/unreleased/stop-supervisor-if-failure.md
@@ -0,0 +1,7 @@
+Bugfix: Stop the supervisor if a service fails to start
+
+Steps to make the supervisor fail:
+
+`PROXY_HTTP_ADDR=0.0.0.0:9144 bin/ocis server`
+
+https://github.com/owncloud/ocis/pull/1963