diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java
index f7c0696dd6..8566b2aab3 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java
@@ -57,7 +57,7 @@ public class TcpSendingMessageHandler extends AbstractMessageHandler implements
 
 	private Map<String, TcpConnection> connections = new ConcurrentHashMap<String, TcpConnection>();
 
-	private volatile boolean autoStartup;
+	private volatile boolean autoStartup = true;
 
 	private volatile int phase;
 
@@ -233,9 +233,7 @@ public class TcpSendingMessageHandler extends AbstractMessageHandler implements
 	}
 
 	public boolean isRunning() {
-		boolean cfRunning = this.clientConnectionFactory != null ? this.clientConnectionFactory.isRunning() : false;
-		boolean sfRunning = this.serverConnectionFactory != null ? this.serverConnectionFactory.isRunning() : false;
-		return cfRunning | sfRunning;
+		return this.active;
 	}
 
 	public int getPhase() {