diff --git a/commons/src/main/java/org/restheart/utils/CleanerUtils.java b/commons/src/main/java/org/restheart/utils/CleanerUtils.java
index 55588d95a..ae62983dd 100644
--- a/commons/src/main/java/org/restheart/utils/CleanerUtils.java
+++ b/commons/src/main/java/org/restheart/utils/CleanerUtils.java
@@ -24,10 +24,10 @@
 
 public class CleanerUtils {
     private static CleanerUtils instance = null;
-    private Cleaner cleaner;
+    private final Cleaner cleaner;
 
     private CleanerUtils() {
-        this.cleaner = Cleaner.create();
+        this.cleaner = Cleaner.create(Thread.ofVirtual().factory());
     }
 
     public static CleanerUtils get() {