diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java
index a53f8cec9de..a2f18196961 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java
@@ -201,39 +201,46 @@ private void doSelect(ServerSocketChannel server, final Selector selector) throw
 	@Override
 	protected void doAccept(final Selector selector, ServerSocketChannel server, long now) throws IOException {
 		logger.debug("New accept");
-		SocketChannel channel = server.accept();
-		if (isShuttingDown()) {
-			if (logger.isInfoEnabled()) {
-				logger.info("New connection from " + channel.socket().getInetAddress().getHostAddress()
-						+ ":" + channel.socket().getPort()
-						+ " rejected; the server is in the process of shutting down.");
+		// when many new connections arrive, we should
+		// accept connections in a for loop until no new connection is ready
+		for (;;) {
+			SocketChannel channel = server.accept();
+			if (channel == null) {
+				return;
 			}
-			channel.close();
-		}
-		else {
-			try {
-				channel.configureBlocking(false);
-				Socket socket = channel.socket();
-				setSocketAttributes(socket);
-				TcpNioConnection connection = createTcpNioConnection(channel);
-				if (connection == null) {
-					return;
+			if (isShuttingDown()) {
+				if (logger.isInfoEnabled()) {
+					logger.info("New connection from " + channel.socket().getInetAddress().getHostAddress()
+							+ ":" + channel.socket().getPort()
+							+ " rejected; the server is in the process of shutting down.");
 				}
-				connection.setTaskExecutor(getTaskExecutor());
-				connection.setLastRead(now);
-				if (getSslHandshakeTimeout() != null && connection instanceof TcpNioSSLConnection) {
-					((TcpNioSSLConnection) connection).setHandshakeTimeout(getSslHandshakeTimeout());
-				}
-				this.channelMap.put(channel, connection);
-				channel.register(selector, SelectionKey.OP_READ, connection);
-				connection.publishConnectionOpenEvent();
-			}
-			catch (Exception e) {
-				logger.error("Exception accepting new connection from "
-						+ channel.socket().getInetAddress().getHostAddress()
-						+ ":" + channel.socket().getPort(), e);
 				channel.close();
 			}
+			else {
+				try {
+					channel.configureBlocking(false);
+					Socket socket = channel.socket();
+					setSocketAttributes(socket);
+					TcpNioConnection connection = createTcpNioConnection(channel);
+					if (connection == null) {
+						return;
+					}
+					connection.setTaskExecutor(getTaskExecutor());
+					connection.setLastRead(now);
+					if (getSslHandshakeTimeout() != null && connection instanceof TcpNioSSLConnection) {
+						((TcpNioSSLConnection) connection).setHandshakeTimeout(getSslHandshakeTimeout());
+					}
+					this.channelMap.put(channel, connection);
+					channel.register(selector, SelectionKey.OP_READ, connection);
+					connection.publishConnectionOpenEvent();
+				}
+				catch (Exception e) {
+					logger.error("Exception accepting new connection from "
+							+ channel.socket().getInetAddress().getHostAddress()
+							+ ":" + channel.socket().getPort(), e);
+					channel.close();
+				}
+			}
 		}
 	}