diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h
index 5613db52..389cd379 100644
--- a/code/espurna/config/general.h
+++ b/code/espurna/config/general.h
@@ -158,6 +158,7 @@
 #define MQTT_TOPIC_VCC          "/vcc"
 #define MQTT_TOPIC_STATUS       "/status"
 #define MQTT_TOPIC_MAC          "/mac"
+#define MQTT_TOPIC_RSSI         "/rssi"
 #define MQTT_TOPIC_APP          "/app"
 #define MQTT_TOPIC_INTERVAL     "/interval"
 #define MQTT_TOPIC_HOSTNAME     "/hostname"
@@ -166,6 +167,7 @@
 #define MQTT_REPORT_STATUS      1
 #define MQTT_REPORT_IP          1
 #define MQTT_REPORT_MAC         1
+#define MQTT_REPORT_RSSI        1
 #define MQTT_REPORT_UPTIME      1
 #define MQTT_REPORT_FREEHEAP    1
 #define MQTT_REPORT_VCC         1
diff --git a/code/espurna/espurna.ino b/code/espurna/espurna.ino
index 5dd8b02b..8c0078a6 100644
--- a/code/espurna/espurna.ino
+++ b/code/espurna/espurna.ino
@@ -69,6 +69,9 @@ void heartbeat() {
     #if (MQTT_REPORT_MAC)
         mqttSend(MQTT_TOPIC_MAC, WiFi.macAddress().c_str());
     #endif
+    #if (MQTT_REPORT_RSSI)
+        mqttSend(MQTT_TOPIC_RSSI, String(WiFi.RSSI()).c_str());
+    #endif
     #if (MQTT_REPORT_UPTIME)
         mqttSend(MQTT_TOPIC_UPTIME, String(uptime_seconds).c_str());
     #endif