diff --git a/NEWS b/NEWS
index cdd3cc745d4fae1a66b63362c691e0e88ab4e27f..c53d033ace9a2dc2dd9b10c148d07a15bf162421 100644
--- a/NEWS
+++ b/NEWS
@@ -415,6 +415,8 @@ documents those changes that are of interest to users and administrators.
  -- Log Cray MPI job calling exit() without mpi_fini(), but do not treat it as
     a fatal error. This partially reverts logic added in version 14.03.9.
  -- sview - Fix displaying of suspended steps elapsed times.
+ -- Increase number of messages that get cached before throwing them away
+    when the DBD is down.
 
 * Changes in Slurm 14.03.10
 ===========================
diff --git a/src/common/slurmdbd_defs.c b/src/common/slurmdbd_defs.c
index 5a1a33be69d605d0949b3f08272ac54fcee8adb5..5031ccf1db21b69eda6eb0ec24f21a77a0ee87e6 100644
--- a/src/common/slurmdbd_defs.c
+++ b/src/common/slurmdbd_defs.c
@@ -359,7 +359,9 @@ extern int slurm_send_slurmdbd_msg(uint16_t rpc_version, slurmdbd_msg_t *req)
 	 * MAX_AGENT_QUEUE which ever is bigger */
 	if (!max_agent_queue)
 		max_agent_queue =
-			MAX(MAX_AGENT_QUEUE, slurmctld_conf.max_job_cnt * 2);
+			MAX(MAX_AGENT_QUEUE,
+			    ((slurmctld_conf.max_job_cnt * 2) +
+			     (node_record_count * 4)));
 
 	buffer = pack_slurmdbd_msg(req, rpc_version);