diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8cf6e4d6f..bd3850202 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ This document describes rules that are in effect for this repository, meant for
 
 1. Opening an issue means that a problem exists in the code and should be addressed by the project contributors.
 2. When opening an issue, it is required to fill out the presented template. The requested information is important! If the template is ignored or insufficient info about the issue is provided, the issue may be closed.
-3. Questions of type "How do I..." or "Can you please help me with..." or "Can EMS-ESP do..." are better directed to the support channel in Gitter.
+3. Questions of type "How do I..." or "Can you please help me with..." or "Can EMS-ESP do..." are better directed to the support channel on Discord.
 4. Issues about topics already handled in the documentation will be closed in a similar manner.
 5. Issues for unmerged PRs will be closed. If there is an issue with a PR, the explanation should be added to the PR itself.
 6. Issues with accompanied investigation that shows the root of the problem should be given priority.
diff --git a/README.md b/README.md
index f5d7909bb..4116d8315 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,12 @@
 
 **EMS-ESP** is an open-source firmware for the Espressif microcontroller that communicates with **EMS** (Energy Management System) based equipment from manufacturers like Bosch, Buderus, Nefit, Junkers, Worcester and Sieger.
 
-This is the EMS32 version.
+This is the ESP32 version.
 
 
 [![license](https://img.shields.io/github/license/proddy/EMS-ESP.svg)](LICENSE)
-[![gitter](https://img.shields.io/gitter/room/EMS-ESP/EMS-ESP.svg)](https://gitter.im/EMS-ESP/community)
+[![chat](https://img.shields.io/discord/816637840644505620.svg?style=flat-square&color=blueviolet)](https://discord.gg/rqegzSrK)
+
 
 If you like **EMS-ESP**, please give it a star, or fork it and contribute!
 
@@ -64,7 +65,7 @@ If you're looking for support on **EMS-ESP** there are some options available:
 
 ### Support Community
 
-* [EMS-ESP Support Chat](https://gitter.im/EMS-ESP/community#): For support, troubleshooting and general questions. You have better chances to get fast answers from members of the community
+* [Discord Server](https://discord.gg/rqegzSrK): For support, troubleshooting and general questions. You have better chances to get fast answers from members of the community
 * [Search in Issues](https://github.com/proddy/EMS-ESP/issues): You might find an answer to your question by searching current or closed issues
 
 ### Developer's Community
diff --git a/interface/src/project/EMSESPHelp.tsx b/interface/src/project/EMSESPHelp.tsx
index 5dbef581a..be27f434c 100644
--- a/interface/src/project/EMSESPHelp.tsx
+++ b/interface/src/project/EMSESPHelp.tsx
@@ -34,7 +34,7 @@ class EMSESPHelp extends Component {
                             <CommentIcon />
                         </ListItemAvatar>
                         <ListItemText>
-                            For live community chat visit our <Link href="https://gitter.im/EMS-ESP/community#" color="primary">{'Gitter'}&nbsp;channel</Link>
+                            For live community chat join our <Link href="https://discord.gg/rqegzSrK" color="primary">{'Discord'}&nbsp;server</Link>
                         </ListItemText>
                     </ListItem>