diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java b/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
index d520fa1422..9782f3b04d 100644
--- a/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
@@ -42,10 +42,10 @@ public final class SelectorManager {
     private Executor selectorExecutor = createDefaultExecutor();
     private Executor channelExecutor = selectorExecutor;
     private LinkedList<SelectorWorker> freeWorkers = new LinkedList<SelectorWorker>();
-    private int maxChannelsPerWorker = 64;
+    private int maxChannelsPerWorker = 1024;
     
     protected ExecutorService createDefaultExecutor() {
-        ThreadPoolExecutor rc = new ThreadPoolExecutor(0, 200, 1, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), new ThreadFactory() {
+        ThreadPoolExecutor rc = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 10, TimeUnit.MILLISECONDS, new SynchronousQueue<Runnable>(), new ThreadFactory() {
             public Thread newThread(Runnable runnable) {
                 return new Thread(runnable, "ActiveMQ NIO Worker");
             }