diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/BlockingRejectedExecutionHandler.java b/src/main/java/ru/nbch/credit_tracker/service/task/BlockingRejectedExecutionHandler.java
deleted file mode 100644
index d239c11..0000000
--- a/src/main/java/ru/nbch/credit_tracker/service/task/BlockingRejectedExecutionHandler.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package ru.nbch.credit_tracker.service.task;
-
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ThreadPoolExecutor;
-
-public class BlockingRejectedExecutionHandler implements RejectedExecutionHandler {
-
-    public static RejectedExecutionHandler INSTANCE = new BlockingRejectedExecutionHandler();
-
-    @Override
-    public void rejectedExecution(Runnable r, ThreadPoolExecutor exec) {
-        try {
-            if (exec.isShutdown()) {
-                throw new RejectedExecutionException("Executor is shut down");
-            }
-            exec.getQueue().put(r);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RejectedExecutionException("Interrupted while enqueueing task", e);
-        }
-    }
-}
diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/Stage.java b/src/main/java/ru/nbch/credit_tracker/service/task/Stage.java
index 8274266..f585956 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/task/Stage.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/task/Stage.java
@@ -41,7 +41,7 @@ public class Stage<X extends StagePayload, Z extends StagePayload> implements Ru
                 t.setName("pipe-handler-%s-%d".formatted(dispatcher.getClass().getSimpleName(), t.threadId()));
                 return t;
             },
-            BlockingRejectedExecutionHandler.INSTANCE
+            new ThreadPoolExecutor.CallerRunsPolicy()
         );
         this.POISON = POISON;
     }
diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FlagsEnricherV2.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FlagsEnricherV2.java
index 4c7f4fe..8bfb0f9 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FlagsEnricherV2.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FlagsEnricherV2.java
@@ -22,7 +22,6 @@ import ru.nbch.credit_tracker.mapper.signal.PhoneFidMapMapper;
 import ru.nbch.credit_tracker.model.SubjectProfile;
 import ru.nbch.credit_tracker.model.impl.SubjectPayload;
 import ru.nbch.credit_tracker.service.indic.FlagsService2;
-import ru.nbch.credit_tracker.service.task.BlockingRejectedExecutionHandler;
 
 @Slf4j
 @Service
@@ -49,7 +48,7 @@ public class FlagsEnricherV2 implements Consumer<SubjectPayload> {
                 t.setName("flags-enricher-%d".formatted(t.threadId()));
                 return t;
             },
-            BlockingRejectedExecutionHandler.INSTANCE
+            new ThreadPoolExecutor.CallerRunsPolicy()
         );
     }