diff --git a/Network.cpp b/Network.cpp
index e578143..ab7d45d 100644
--- a/Network.cpp
+++ b/Network.cpp
@@ -646,6 +646,10 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
                              {{"pl_on", "1"},
                               {"pl_off", "0"}});
         }
+        else
+        {
+            removeHassTopic("binary_sensor", "keypad_battery_low", uidString);
+        }
 
         // Battery voltage
         publishHassTopic("sensor",