diff --git a/lib/mysql_data_stream.cpp b/lib/mysql_data_stream.cpp
index 5151d4e94..35b63f535 100644
--- a/lib/mysql_data_stream.cpp
+++ b/lib/mysql_data_stream.cpp
@@ -432,6 +432,11 @@ int MySQL_Data_Stream::read_from_net() {
 		//proxy_info("Entering\n");
 	}
 	if ((revents & POLLIN)==0) return 0;
+	if (revents & POLLHUP) {
+		shut_soft();
+		return -1;
+	}
+
 	int r=0;
 	int s=queue_available(queueIN);
 	if (encrypted) {