diff --git a/src/common/slurmdbd_defs.c b/src/common/slurmdbd_defs.c
index cb681a3125ea9e60aa4e026a33d0313f943d8c97..112c46f59058bc684f259e4ea85d717483712c7f 100644
--- a/src/common/slurmdbd_defs.c
+++ b/src/common/slurmdbd_defs.c
@@ -324,8 +324,10 @@ extern int slurm_send_slurmdbd_msg(uint16_t rpc_version, slurmdbd_msg_t *req)
 	static time_t syslog_time = 0;
 	static int max_agent_queue = 0;
 
-	/* Whatever our max job count is times that by 2 or
-	 * MAX_AGENT_QUEUE which ever is bigger */
+	/*
+	 * Whatever our max job count is multiplied by 2 plus node count
+	 * multiplied by 4 or MAX_AGENT_QUEUE which ever is bigger.
+	 */
 	if (!max_agent_queue)
 		max_agent_queue =
 			MAX(MAX_AGENT_QUEUE,