diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 09fea712edc0..766597cae9d4 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,7 +4,7 @@ contact_links:
     url: https://github.com/Comfy-Org/ComfyUI_frontend/issues
     about: Issues related to the ComfyUI frontend (display issues, user interaction bugs), please go to the frontend repo to file the issue
   - name: ComfyUI Matrix Space
-    url: https://app.element.io/#/room/%23comfyui_space%3Amatrix.org
+    url: https://matrix.to/#/#comfyui_space:matrix.org
     about: The ComfyUI Matrix Space is available for support and general discussion related to ComfyUI (Matrix is like Discord but open source).
   - name: Comfy Org Discord
     url: https://discord.gg/comfyorg
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 419721b63b4c..aee5e403787b 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -11,7 +11,7 @@ body:
                 **2:** You have looked to make sure there is not already a feature that does what you need, and there is not already a Feature Request listed for the same idea.
                 **3:** This is something that makes sense to add to ComfyUI Core, and wouldn't make more sense as a custom node.
 
-                If unsure, ask on the [ComfyUI Matrix Space](https://app.element.io/#/room/%23comfyui_space%3Amatrix.org) or the [Comfy Org Discord](https://discord.gg/comfyorg) first.
+                If unsure, ask on the [ComfyUI Matrix Space](https://matrix.to/#/#comfyui_space:matrix.org) or the [Comfy Org Discord](https://discord.gg/comfyorg) first.
     - type: textarea
       attributes:
             label: Feature Idea
diff --git a/.github/ISSUE_TEMPLATE/user-support.yml b/.github/ISSUE_TEMPLATE/user-support.yml
index 281661f92633..9c3598ed85e5 100644
--- a/.github/ISSUE_TEMPLATE/user-support.yml
+++ b/.github/ISSUE_TEMPLATE/user-support.yml
@@ -10,7 +10,7 @@ body:
             **1:** You are running the latest version of ComfyUI.
             **2:** You have made an effort to find public answers to your question before asking here. In other words, you googled it first, and scrolled through recent help topics.
 
-                If unsure, ask on the [ComfyUI Matrix Space](https://app.element.io/#/room/%23comfyui_space%3Amatrix.org) or the [Comfy Org Discord](https://discord.gg/comfyorg) first.
+                If unsure, ask on the [ComfyUI Matrix Space](https://matrix.to/#/#comfyui_space:matrix.org) or the [Comfy Org Discord](https://discord.gg/comfyorg) first.
     - type: checkboxes
       id: custom-nodes-test
       attributes:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 048f127e72dd..f57716baf0f6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ There are several ways in which you can contribute, beyond writing code. The goa
 
 ## Asking Questions
 
-Have a question? Instead of opening an issue, please ask on [Discord](https://comfy.org/discord) or [Matrix](https://app.element.io/#/room/%23comfyui_space%3Amatrix.org) channels. Our team and the community will help you.
+Have a question? Instead of opening an issue, please ask on [Discord](https://comfy.org/discord) or [Matrix](https://matrix.to/#/#comfyui_space:matrix.org) channels. Our team and the community will help you.
 
 ## Providing Feedback
 
diff --git a/README.md b/README.md
index 8142f595bcd0..dddaff74243b 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 [![][github-downloads-latest-shield]][github-downloads-link]
 
 [matrix-shield]: https://img.shields.io/badge/Matrix-000000?style=flat&logo=matrix&logoColor=white
-[matrix-url]: https://app.element.io/#/room/%23comfyui_space%3Amatrix.org
+[matrix-url]: https://matrix.to/#/#comfyui_space:matrix.org
 [website-shield]: https://img.shields.io/badge/ComfyOrg-4285F4?style=flat
 [website-url]: https://www.comfy.org/
 <!-- Workaround to display total user from https://github.com/badges/shields/issues/4500#issuecomment-2060079995 -->
@@ -376,7 +376,7 @@ Use `--tls-keyfile key.pem --tls-certfile cert.pem` to enable TLS/SSL, the app w
 
 [Discord](https://comfy.org/discord): Try the #help or #feedback channels.
 
-[Matrix space: #comfyui_space:matrix.org](https://app.element.io/#/room/%23comfyui_space%3Amatrix.org) (it's like discord but open source).
+[Matrix space: #comfyui_space:matrix.org](https://matrix.to/#/#comfyui_space:matrix.org) (it's like discord but open source).
 
 See also: [https://www.comfy.org/](https://www.comfy.org/)