diff --git a/roles/slurm_management/templates/slurm.conf.22.05.2-1.el7.umcg b/roles/slurm_management/templates/slurm.conf.22.05.2-1.el7.umcg
index 49c21213f..4c2508b7c 100644
--- a/roles/slurm_management/templates/slurm.conf.22.05.2-1.el7.umcg
+++ b/roles/slurm_management/templates/slurm.conf.22.05.2-1.el7.umcg
@@ -106,13 +106,13 @@ PartitionName={{ partition.name }} Default={{ partition.default }} Nodes={{ part
 # Compute nodes
 #
 {% for node in groups['compute_vm'] %}
-{% if node != groups['user_interface'] | first %}{# this checks if the cluster is a single machine and prevents double entry of UI and node #}
 NodeName={{ node }} Sockets={{ hostvars[node]['slurm_sockets'] }} CoresPerSocket={{ hostvars[node]['slurm_cores_per_socket'] }} ThreadsPerCore=1 State=UNKNOWN RealMemory={{ hostvars[node]['slurm_real_memory'] }} TmpDisk={{ hostvars[node]['slurm_local_disk'] | default(0, true) }} Feature={{ hostvars[node]['slurm_features'] }}
-{% endif %}
 {% endfor %}
 #
 # User Interface nodes (only for data staging jobs).
 #
 {% for node in groups['user_interface'] %}
+{% if node not in groups['compute_vm'] %}{# this checks if the cluster is a single machine and prevents double entry of UI and node #}
 NodeName={{ node }} Sockets={{ hostvars[node]['slurm_sockets'] }} CoresPerSocket={{ hostvars[node]['slurm_cores_per_socket'] }} ThreadsPerCore=1 State=UNKNOWN RealMemory={{ hostvars[node]['slurm_real_memory'] }} TmpDisk={{ hostvars[node]['slurm_local_disk'] | default(0, true) }} Feature={{ hostvars[node]['slurm_features'] }}
+{% endif %}
 {% endfor %}