diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
index 1adb92fafa..0e72a590cd 100644
--- a/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
@@ -51,7 +51,7 @@ public final class SelectorManager {
                 @Override
                 public Thread newThread(Runnable runnable) {
                     Thread t = new Thread(runnable, "ActiveMQ NIO Worker " + (i++));
-                    t.setDaemon(false);
+                    t.setDaemon(true);
                     return t;
                 }
             });