diff --git a/README.md b/README.md
index ad52a4ff3..84036dd79 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ Licensed under AGPLv3. For our list of contributors, see [AUTHORS](AUTHORS).
The license does not include the HedgeDoc logo, whose terms of usage can be found in the [github repository](https://github.com/hedgedoc/hedgedoc-logo).
[matrix.org-image]: https://img.shields.io/matrix/hedgedoc:matrix.org?logo=matrix&server_fqdn=matrix.org
-[matrix.org-url]: https://matrix.to/#/#hedgedoc:matrix.org
+[matrix.org-url]: https://chat.hedgedoc.org
[github-version-badge]: https://img.shields.io/github/release/hedgedoc/hedgedoc.svg
[github-release-page]: https://github.com/hedgedoc/hedgedoc/releases
[github-release-feed]: https://github.com/hedgedoc/hedgedoc/releases.atom
diff --git a/SECURITY.md b/SECURITY.md
index d7e7390ba..0e6660f87 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -16,7 +16,7 @@ which will take care of the encryption for you.
We'll get back to you as soon as possible. You can expect an answer within
3 days, in rare cases within a month. If you don't get a reply within a month,
-please reach out for other contact addresses in the [community chat](https://matrix.to/#/#hedgedoc:matrix.org).
+please reach out for other contact addresses in the [community chat](https://chat.hedgedoc.org).
When your findings are accepted as a security issue, we'll work an a fix or
at least a workaround for the next release. With the release that contained
@@ -29,4 +29,4 @@ a fix yourself and contribute it to HedgeDoc, as well as publish them as you
like and allow people to make in informed decision about using HedgeDoc.
If you have any further questions, feel free to reach out to the
-[community chat](https://matrix.to/#/#hedgedoc:matrix.org) or the mentioned contacts above.
+[community chat](https://chat.hedgedoc.org) or the mentioned contacts above.
diff --git a/public/docs/features.md b/public/docs/features.md
index 8c88d7ae7..378b81dd6 100644
--- a/public/docs/features.md
+++ b/public/docs/features.md
@@ -7,7 +7,7 @@ This means that you can write notes with other people on your **desktop**, **tab
You can sign-in via multiple auth providers like **Facebook**, **Twitter**, **GitHub** and many more on the [*homepage*](/).
If you experience any *issues*, feel free to report it on [**GitHub**](https://github.com/hedgedoc/hedgedoc/issues).
-Or meet us on [**Matrix.org**](https://matrix.to/#/#hedgedoc:matrix.org) for dev-talk and interactive help.
+Or meet us on [**Matrix**](https://chat.hedgedoc.org) for dev-talk and interactive help.
**Thank you very much!**
## Workspace
diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs
index 6176cb6e7..d3552c75d 100644
--- a/public/views/index/body.ejs
+++ b/public/views/index/body.ejs
@@ -162,7 +162,7 @@
<%- __('Powered by %s', 'HedgeDoc') %> | <%= __('Releases') %> | <%= __('Source Code') %><% if(imprint) { %> | <%= __('Imprint') %><% } %><% if(privacyStatement) { %> | <%= __('Privacy') %><% } %><% if(termsOfUse) { %> | <%= __('Terms of Use') %><% } %>