diff --git a/gaugemqttcontinuous.py b/gaugemqttcontinuous.py
index b7180a6..8a9496d 100644
--- a/gaugemqttcontinuous.py
+++ b/gaugemqttcontinuous.py
@@ -486,12 +486,11 @@ def connect_mqtt():
     client.connect()
     client_ref = client
     
-    # Explicit subscriptions
-    client.subscribe(T_SET)
-    client.subscribe(T_ZERO)
-    client.subscribe(T_RESET_DISCOVERY)  # Reset discovery flag
-    for gt in gauge_topics:
-        client.subscribe(gt["set"])
+    # Subscriptions
+    def _subscribe_all(c):
+        c.subscribe("#")
+    
+    _subscribe_all(client)
     
     _mqtt_connected = True
     info(f"MQTT connected  client_id={MQTT_CLIENT_ID}")
@@ -535,17 +534,7 @@ def check_mqtt():
             client_ref.set_last_will(T_STATUS, b"offline", retain=True, qos=0)
             client_ref.set_callback(on_message)
             client_ref.connect()
-            client_ref.subscribe(T_SET)
-            client_ref.subscribe(T_ZERO)
-            client_ref.subscribe(T_RESET_DISCOVERY)
-            for gt in gauge_topics:
-                client_ref.subscribe(gt["set"])
-                client_ref.subscribe(gt["zero"])
-                client_ref.subscribe(gt["led_red"])
-                client_ref.subscribe(gt["led_green"])
-                client_ref.subscribe(gt["led_bl"])
-                client_ref.subscribe(gt["status_red"])
-                client_ref.subscribe(gt["status_green"])
+            _subscribe_all(client_ref)
             _mqtt_connected = True
             info("MQTT reconnected!")
             publish_discovery(client_ref)