diff --git a/README.rst b/README.rst
index 90b7f713577..45b647437e3 100644
--- a/README.rst
+++ b/README.rst
@@ -148,7 +148,7 @@ Communication channels
 
 *aio-libs Discussions*: https://github.com/aio-libs/aiohttp/discussions
 
-*gitter chat* https://gitter.im/aio-libs/Lobby
+*Matrix*: `#aio-libs:matrix.org <https://matrix.to/#/#aio-libs:matrix.org>`_
 
 We support `Stack Overflow
 <https://stackoverflow.com/questions/tagged/aiohttp>`_.
diff --git a/docs/index.rst b/docs/index.rst
index 4f55c5ddf09..9692152cb99 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -174,7 +174,7 @@ Communication channels
 
 Feel free to post your questions and ideas here.
 
-*gitter chat* https://gitter.im/aio-libs/Lobby
+*Matrix*: `#aio-libs:matrix.org <https://matrix.to/#/#aio-libs:matrix.org>`_
 
 We support `Stack Overflow
 <https://stackoverflow.com/questions/tagged/aiohttp>`_.