diff --git a/docs/admin/troubleshooting.rst b/docs/admin/troubleshooting.rst
index 1d342d837e502e66a54df42f6203d68e84f936cd..91005e40c8b54023c49e8b68fcff38c55c0173f3 100644
--- a/docs/admin/troubleshooting.rst
+++ b/docs/admin/troubleshooting.rst
@@ -141,7 +141,7 @@ Report an issue or get help
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Well be more than happy to help you to debug installation and configuration issues. The main channel
-for receiving support about your Funkwhale installation is the `#funkwhale-troubleshooting:matrix.org <https://riot.im/app/#/room/#funkwhale-troubleshooting:matrix.org>`_ Matrix channel.
+for receiving support about your Funkwhale installation is the `#funkwhale-troubleshooting:matrix.org <https://matrix.to/#/#funkwhale-troubleshooting:matrix.org>`_ Matrix channel.
 
 Before asking for help, we'd really appreciate if you took the time to go through this document and try to diagnose the problem yourself. But if you don't find
 anything relevant or don't have the time, we'll be there for you!
diff --git a/docs/documentation/identifying.rst b/docs/documentation/identifying.rst
index 6c267f4b16b1b4912b300c06946418171c9f009c..89012c8d59e9f1645011d8d18dbfefc007133683 100644
--- a/docs/documentation/identifying.rst
+++ b/docs/documentation/identifying.rst
@@ -25,4 +25,4 @@ by requesting a document be written. There are three ways to request new documen
 
 - Open a new issue on `Gitlab <https://dev.funkwhale.audio/funkwhale/funkwhale/issues>`_, providing as much detail as possible
 - Start a new thread on `the forum <https://forum.funkwhale.audio/>`_ with more details about your requests
-- Ask somebody on our `chat room <https://riot.im/app/#/room/#funkwhale:matrix.org>`_
+- Ask somebody on our `chat room <https://matrix.to/#/#funkwhale:matrix.org>`_
diff --git a/docs/users/troubleshooting.rst b/docs/users/troubleshooting.rst
index 818e13bcb52abd086143ce6e215b45afc71d4ae1..57e09cd2e14d950527b8219aae0e1d3ade2ee19a 100644
--- a/docs/users/troubleshooting.rst
+++ b/docs/users/troubleshooting.rst
@@ -79,7 +79,7 @@ Report an issue or get help
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Well be more than happy to help you to debug installation and configuration issues. The main channel
-for receiving support about your Funkwhale installation is the `#funkwhale-troubleshooting:matrix.org <https://riot.im/app/#/room/#funkwhale-troubleshooting:matrix.org>`_ Matrix channel.
+for receiving support about your Funkwhale installation is the `#funkwhale-troubleshooting:matrix.org <https://matrix.to/#/#funkwhale-troubleshooting:matrix.org>`_ Matrix channel.
 
 Before asking for help, we'd really appreciate if you took the time to go through this document and try to diagnose the problem yourself. But if you don't find
 anything relevant or don't have the time, we'll be there for you!
diff --git a/front/src/components/Footer.vue b/front/src/components/Footer.vue
index cdc28e3eef2731da44c93e35b0615e448fb8fc10..0610318708dd67795ea66bdc9f2221299ddeada8 100644
--- a/front/src/components/Footer.vue
+++ b/front/src/components/Footer.vue
@@ -58,7 +58,7 @@
           <h4 v-translate translate-context="Footer/*/Link" class="ui header">Getting help</h4>
           <div class="ui list">
             <a href="https://forum.funkwhale.audio/" class="link item" target="_blank"><translate translate-context="Footer/*/Listitem.Link">Support forum</translate></a>
-            <a href="https://riot.im/app/#/room/#funkwhale-troubleshooting:matrix.org" class="link item" target="_blank"><translate translate-context="Footer/*/List item.Link">Chat room</translate></a>
+            <a href="https://matrix.to/#/#funkwhale-troubleshooting:matrix.org" class="link item" target="_blank"><translate translate-context="Footer/*/List item.Link">Chat room</translate></a>
             <a href="https://dev.funkwhale.audio/funkwhale/funkwhale/issues" class="link item" target="_blank"><translate translate-context="Footer/*/List item.Link">Issue tracker</translate></a>
           </div>
         </section>