diff --git a/src/common/gres.c b/src/common/gres.c
index 7fb12a300e1a6788bae987820c0f11739ead0cb9..798ef8c91c6c267ab190a3cd9c65e71e13429ce0 100644
--- a/src/common/gres.c
+++ b/src/common/gres.c
@@ -2779,7 +2779,13 @@ extern int _job_alloc(void *job_gres_data, void *node_gres_data,
 	    node_gres_ptr->topo_gres_bitmap &&
 	    node_gres_ptr->topo_gres_cnt_alloc) {
 		for (i = 0; i < node_gres_ptr->topo_cnt; i++) {
+			/* Insure that if specific CPUs are associated with
+			 * specific GRES and the CPU count matches the
+			 * slurmctld configuration that we only use the GRES
+			 * on the CPUs that have already been allocated. */
 			if (core_bitmap &&
+			    (bit_size(core_bitmap) ==
+			     bit_size(node_gres_ptr->topo_cpus_bitmap[i])) &&
 			    !bit_overlap(core_bitmap,
 					 node_gres_ptr->topo_cpus_bitmap[i]))
 				continue;