diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetServerConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetServerConnectionFactory.java
index e6b44ef9afe..38109990611 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetServerConnectionFactory.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetServerConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -116,7 +116,7 @@ public void run() {
 		}
 		try {
 			setupServerSocket();
-			while (true) {
+			while (isActive()) {
 				acceptConnectionAndExecute();
 			}
 		}
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java
index b94a5c71f83..c298fcf994d 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -222,12 +222,6 @@ public void testObtainConnectionIds(AbstractServerConnectionFactory serverFactor
 		scheduler.shutdown();
 	}
 
-	@Test
-	public void testEarlyCloseNet() throws Exception {
-		AbstractServerConnectionFactory factory = new TcpNetServerConnectionFactory(0);
-		testEarlyClose(factory, "serverSocket", " stopped before accept");
-	}
-
 	@Test
 	public void testEarlyCloseNio() throws Exception {
 		AbstractServerConnectionFactory factory = new TcpNioServerConnectionFactory(0);