diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java
index f82806f4ef0..c749b555cdf 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java
@@ -71,7 +71,7 @@ private class CleanupVisitor implements FileVisitor<Path> {
     private final Instant cutoff;
     private final Instant timeoutTarget;
 
-    private boolean terminated;
+    private boolean terminated = false;
 
     CleanupVisitor(boolean cleanSelf, long timeout, TimeUnit unit) {
       this.cleanSelf = cleanSelf;
@@ -107,7 +107,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
       // the JFR repository directories are under <basedir>/pid_<pid>
       String pid = fileName.startsWith("pid_") ? fileName.substring(4) : null;
       boolean isSelfPid = pid != null && pid.equals(PidHelper.getPid());
-      shouldClean |= (cleanSelf && isSelfPid) || (!cleanSelf && !pidSet.contains(pid));
+      shouldClean |= cleanSelf ? isSelfPid : !isSelfPid && !pidSet.contains(pid);
       if (shouldClean) {
         log.debug("Cleaning temporary location {}", dir);
       }