diff --git a/roles/slurm-common/templates/job_submit.lua.j2 b/roles/slurm-common/templates/job_submit.lua.j2
index 646844f9d79ec9a276a44aaae9caff0928795fe2..402015f7f70ec8ac4b4089289ab3e5316e2241ea 100644
--- a/roles/slurm-common/templates/job_submit.lua.j2
+++ b/roles/slurm-common/templates/job_submit.lua.j2
@@ -38,9 +38,9 @@ if ((job_desc.partition == "m3c" ) or (job_desc.partition == "m3h" ) or (job_des
 end
 
 
--- Check for QOS rtq in m3c, m3h and m3g, then forward job to rtqp,comp,m3g
+-- Check for QOS rtq in m3c, m3h , m3g and partition=nil, then forward job to rtqp,comp,m3g
 
-if job_desc.qos == "rtq"  then
+if ((job_desc.qos == "rtq") and (job_desc.partition == nil)) then
    local partition = ""
    partition = "rtqp,comp,m3g"
    slurm.log_info("slurm_job_submit: for user: %u, partition: %s", submit_uid, partition)