diff --git a/ChangeLog.txt b/ChangeLog.txt
index f2123f6f..60eca9e3 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -20,6 +20,7 @@ Broker:
   #170.
 - mosquitto_passwd utility now correctly deals with unknown command line
   arguments in all cases. Closes #169.
+- Fix publishing of $SYS/broker/clients/maximum
 
 Client library:
 - Fix the case where a message received just before the keepalive timer
diff --git a/src/sys_tree.c b/src/sys_tree.c
index 343e6246..be421b16 100644
--- a/src/sys_tree.c
+++ b/src/sys_tree.c
@@ -44,7 +44,7 @@ static void _sys_update_clients(struct mosquitto_db *db, char *buf)
 {
 	static unsigned int client_count = -1;
 	static int clients_expired = -1;
-	static unsigned int client_max = -1;
+	static unsigned int client_max = 0;
 	static unsigned int disconnected_count = -1;
 	static unsigned int connected_count = -1;