diff --git a/gaugemqttcontinuous.py b/gaugemqttcontinuous.py
index 7e045c4..995c0af 100644
--- a/gaugemqttcontinuous.py
+++ b/gaugemqttcontinuous.py
@@ -586,7 +586,7 @@ def connect_mqtt():
         password=MQTT_PASSWORD,
         keepalive=60,
     )
-    client.set_last_will(T_STATUS, b"offline", retain=True, qos=0)
+    client.set_last_will(gauge_topics[0]["status"], b"offline", retain=True, qos=0)
     client.set_callback(on_message)
     client.connect()
     client_ref = client
@@ -639,7 +639,9 @@ def check_mqtt():
                 password=MQTT_PASSWORD,
                 keepalive=60,
             )
-            client_ref.set_last_will(T_STATUS, b"offline", retain=True, qos=0)
+            client_ref.set_last_will(
+                gauge_topics[0]["status"], b"offline", retain=True, qos=0
+            )
             client_ref.set_callback(on_message)
             client_ref.connect()
             client_ref.subscribe(T_SET)