diff --git a/server.py b/server.py
index 363dc61..e35c817 100755
--- a/server.py
+++ b/server.py
@@ -526,6 +526,7 @@ def get_error_pk(self):
 
 	def get_average_clients(self):
 		if self.updateCount:
+			# FIXME: this is quite biased to servers that are new (or restart often)
 			return round(self.totalClients / self.updateCount)
 		return 0
 
@@ -582,7 +583,7 @@ def track_update(self, old: 'Server', is_update: bool):
 		# Popularity
 		if old:
 			self.updateCount = old.updateCount + 1
-			self.totalClients += self.meta["clients"]
+			self.totalClients = old.totalClients + self.meta["clients"]
 			self.meta["clients_top"] = max(self.meta["clients"], old.meta["clients_top"])
 		else:
 			self.updateCount = 1