diff --git a/src/loop.c b/src/loop.c
index 5914e6f308..80963ff26c 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -414,11 +414,6 @@ static void loop_handle_reads_writes(struct mosquitto_db *db, struct pollfd *pol
 				continue;
 			}
 		}
-
-		if(pollfds[context->pollfd_index].revents & (POLLERR | POLLNVAL)){
-			do_disconnect(db, context);
-			continue;
-		}
 	}
 }