diff -r e00f8ff4de9a -r 798dd0c4fd00 thermferm/thermferm.c
--- a/thermferm/thermferm.c	Sat Apr 25 20:31:31 2020 +0200
+++ b/thermferm/thermferm.c	Mon May 18 11:03:40 2020 +0200
@@ -405,8 +405,6 @@
     current_unit->mqtt_flag |= MQTT_FLAG_DATA;
     if ((current_unit->mode == UNITMODE_OFF) && (mode != UNITMODE_OFF)) {
 	current_unit->mqtt_flag |= MQTT_FLAG_BIRTH;
-    } else if ((current_unit->mode != UNITMODE_OFF) && (mode == UNITMODE_OFF)) {
-	current_unit->mqtt_flag |= MQTT_FLAG_DEATH;
     }
     syslog(LOG_NOTICE, "Mode from %s to %s via panel interface", UNITMODE[current_unit->mode], UNITMODE[mode]);
     current_unit->mode = mode;