diff --git a/TheengsGateway/ble_gateway.py b/TheengsGateway/ble_gateway.py
index 94b5c37..cb20428 100644
--- a/TheengsGateway/ble_gateway.py
+++ b/TheengsGateway/ble_gateway.py
@@ -237,11 +237,16 @@ def on_message(client, userdata, msg) -> None:  # noqa: ANN001,ARG001
                     if (
                         msg_json["gatewayid"] != self.configuration["gateway_id"]
                         and msg_json["tracker"] in self.discovered_trackers
+                        and self.discovered_trackers[msg_json["tracker"]].time != 0
                     ):
                         self.discovered_trackers[msg_json["tracker"]].time = 0
-                        logger.info("Tracker %s disassociated", msg_json["tracker"])
+                        logger.info(
+                            "Tracker %s disassociated by gateway %s",
+                            msg_json["tracker"],
+                            msg_json["gatewayid"],
+                        )
 
-                    logger.info("Discovered Trackers: %s", self.discovered_trackers)
+                        logger.info("Discovered Trackers: %s", self.discovered_trackers)
 
             else:
                 logger.info(
@@ -632,7 +637,7 @@ def publish_json(
                 round(time()),
                 str(data_json["model_id"]),
             )
-            logger.debug("Discovered Trackers: %s", self.discovered_trackers)
+            logger.info("Discovered Trackers: %s", self.discovered_trackers)
 
         # Remove "track" if PUBLISH_ADVDATA is 0
         if not self.configuration["publish_advdata"] and "track" in data_json: