diff --git a/changes/changelog.d/funkwhale-support.misc b/changes/changelog.d/funkwhale-support.misc
new file mode 100644
index 000000000..66ead41c3
--- /dev/null
+++ b/changes/changelog.d/funkwhale-support.misc
@@ -0,0 +1 @@
+Replaced references to #funkwhale-troubleshooting with #funkwhale-support
diff --git a/docs/admin/troubleshooting.rst b/docs/admin/troubleshooting.rst
index 91005e40c..4b0e57f09 100644
--- a/docs/admin/troubleshooting.rst
+++ b/docs/admin/troubleshooting.rst
@@ -30,7 +30,7 @@ issue tracker.
 
 .. note::
 
-    To get detailed log messages, set the environment variable ``LOGLEVEL=debug``. 
+    To get detailed log messages, set the environment variable ``LOGLEVEL=debug``.
     If you are using the docker setup you can configure this in the ``.env`` file.
 
 Backend issues
@@ -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://matrix.to/#/#funkwhale-troubleshooting:matrix.org>`_ Matrix channel.
+for receiving support about your Funkwhale installation is the `#funkwhale-support:matrix.org <https://matrix.to/#/#funkwhale-support: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/common/UserMenu.vue b/front/src/components/common/UserMenu.vue
index 5110bafa9..17220aa85 100644
--- a/front/src/components/common/UserMenu.vue
+++ b/front/src/components/common/UserMenu.vue
@@ -77,7 +77,7 @@
           {{ labels.forum }}
         </a>
         <a
-          href="https://matrix.to/#/#funkwhale-troubleshooting:matrix.org"
+          href="https://matrix.to/#/#funkwhale-support:matrix.org"
           class="item"
           target="_blank"
         >