diff --git a/mxqd.c b/mxqd.c
index 6d4c340..e923b06 100644
--- a/mxqd.c
+++ b/mxqd.c
@@ -446,6 +446,10 @@ void group_init(struct mxq_group_list *group)
     }
     jobs_max /= g->job_threads;
 
+    /* limit maximum number of jobs on user/group request */
+    if (jobs_max > g->job_max_per_node)
+        jobs_max = g->job_max_per_node;
+
     slots_max = jobs_max * slots_per_job;
     memory_max = jobs_max * g->job_memory;