diff --git a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py
index 4067debc..4cbb1d5d 100644
--- a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py
+++ b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py
@@ -228,6 +228,8 @@ class LovelaceUIPanel:
                 self.render_current_page(requested=True)
             if msg[1] == "buttonPress2":
                 entity_id = msg[2]
+                if entity_id = "":
+                    return
                 btype = msg[3]
                 value = msg[4] if len(msg) > 4 else None
                 if btype == "bExit":