diff --git a/src/main/java/dev/openfeature/sdk/EventProvider.java b/src/main/java/dev/openfeature/sdk/EventProvider.java
index 4ccac184e..c126c1451 100644
--- a/src/main/java/dev/openfeature/sdk/EventProvider.java
+++ b/src/main/java/dev/openfeature/sdk/EventProvider.java
@@ -23,7 +23,7 @@
 public abstract class EventProvider implements FeatureProvider {
     private EventProviderListener eventProviderListener;
     private final ExecutorService emitterExecutor =
-            Executors.newCachedThreadPool(new ConfigurableThreadFactory("openfeature-event-emitter-thread"));
+            Executors.newCachedThreadPool(new ConfigurableThreadFactory("openfeature-event-emitter-thread", true));
 
     void setEventProviderListener(EventProviderListener eventProviderListener) {
         this.eventProviderListener = eventProviderListener;
diff --git a/src/main/java/dev/openfeature/sdk/EventSupport.java b/src/main/java/dev/openfeature/sdk/EventSupport.java
index 0b446c6b2..1a7c4d870 100644
--- a/src/main/java/dev/openfeature/sdk/EventSupport.java
+++ b/src/main/java/dev/openfeature/sdk/EventSupport.java
@@ -28,7 +28,7 @@ class EventSupport {
     private final Map<String, HandlerStore> handlerStores = new ConcurrentHashMap<>();
     private final HandlerStore globalHandlerStore = new HandlerStore();
     private final ExecutorService taskExecutor =
-            Executors.newCachedThreadPool(new ConfigurableThreadFactory("openfeature-event-handler-thread"));
+            Executors.newCachedThreadPool(new ConfigurableThreadFactory("openfeature-event-handler-thread", true));
 
     /**
      * Run all the event handlers associated with this domain.