diff --git a/.gitignore b/.gitignore
index e466427..64f1fe0 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ config.py
 *.csv
 .DS_Store
 *.log
+*.json
diff --git a/talkgroup_ids.json b/talkgroup_ids.json
index c461d84..a588667 100644
--- a/talkgroup_ids.json
+++ b/talkgroup_ids.json
@@ -1,16 +1,19 @@
 {
   "results": [
     {
+      "tgid": 3120,
+      "name": "Kansas Statewide",
       "id": "3120",
-      "callsign": "Kansas Statewide"
     },
     {
+      "tgid": 31201,
+      "name": "BYRG",
       "id": "31201",
-      "callsign": "BYRG"
     },
     {
+      "tgid": 310,
+      "name": "Kerchunk 310",
       "id": "310",
-      "callsign": "Kerchunk 310"
     }
   ]
 }
\ No newline at end of file
diff --git a/web_tables.py b/web_tables.py
index 4338f80..534654a 100755
--- a/web_tables.py
+++ b/web_tables.py
@@ -660,8 +660,9 @@ if __name__ == '__main__':
     update_stats.start(FREQUENCY)
 
     # Start a timout loop
-    timeout = task.LoopingCall(timeout_clients)
-    timeout.start(10)
+    if CLIENT_TIMEOUT > 0:
+        timeout = task.LoopingCall(timeout_clients)
+        timeout.start(10)
 
     # Connect to HBlink
     reactor.connectTCP(HBLINK_IP, HBLINK_PORT, reportClientFactory())