diff --git a/src/slurmd/common/slurmd_cgroup.c b/src/slurmd/common/slurmd_cgroup.c
index 90f692f405a5aa485873394a62c5eb1e6f6106f0..7ecca73c4d54ef2ae0e6e16b9b008c99ac46475f 100644
--- a/src/slurmd/common/slurmd_cgroup.c
+++ b/src/slurmd/common/slurmd_cgroup.c
@@ -297,7 +297,7 @@ error:
 }
 
 extern void fini_system_cgroup(void)
-{
+{dd
 	xcgroup_destroy(&system_cpuset_cg);
 	xcgroup_destroy(&system_memory_cg);
 	xcgroup_ns_destroy(&cpuset_ns);
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index 47a927417fcfc67b39321081b5fc528484479bff..85c588a4ecda0917716baa12886d381df4a9d099 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -1948,13 +1948,7 @@ static int _set_topo_info(void)
  */
 static int _resource_spec_init(void)
 {
-	static bool first_run = true;
-
-	if (first_run) {
-		fini_system_cgroup();	/* Prevent memory leak */
-		first_run = false;
-	}
-
+	fini_system_cgroup();	/* Prevent memory leak */
 	if (_core_spec_init() != SLURM_SUCCESS)
 		error("Resource spec: core specialization disabled");
 	if (_memory_spec_init() != SLURM_SUCCESS)