diff --git a/pymaster.py b/pymaster.py
index fd4539d..e6428d2 100755
--- a/pymaster.py
+++ b/pymaster.py
@@ -92,6 +92,11 @@ class PyMaster:
 
         for i in self.serverList:
 
+            # Cleanup servers by timeout
+            if time() > i.die:
+                self.serverList.remove(i)
+                continue
+
             # Use pregenerated address string
             packet += i.queryAddr