diff --git a/skynet-src/socket_epoll.h b/skynet-src/socket_epoll.h
index cd1f9018..58a26afd 100644
--- a/skynet-src/socket_epoll.h
+++ b/skynet-src/socket_epoll.h
@@ -60,6 +60,7 @@ sp_wait(int efd, struct event *e, int max) {
 		e[i].write = (flag & EPOLLOUT) != 0;
 		e[i].read = (flag & (EPOLLIN | EPOLLHUP)) != 0;
 		e[i].error = (flag & EPOLLERR) != 0;
+		e[i].eof = false;
 	}
 
 	return n;
diff --git a/skynet-src/socket_kqueue.h b/skynet-src/socket_kqueue.h
index 8aa31203..fc282a9a 100644
--- a/skynet-src/socket_kqueue.h
+++ b/skynet-src/socket_kqueue.h
@@ -73,9 +73,11 @@ sp_wait(int kfd, struct event *e, int max) {
 	for (i=0;i<n;i++) {
 		e[i].s = ev[i].udata;
 		unsigned filter = ev[i].filter;
-		e[i].write = (filter == EVFILT_WRITE);
-		e[i].read = (filter == EVFILT_READ);
+		bool eof = (ev[i].flags & EV_EOF) != 0;
+		e[i].write = (filter == EVFILT_WRITE) && (!eof);
+		e[i].read = (filter == EVFILT_READ) && (!eof);
 		e[i].error = false;	// kevent has not error event
+		e[i].eof = eof;
 	}
 
 	return n;
diff --git a/skynet-src/socket_poll.h b/skynet-src/socket_poll.h
index cfd7e870..0a01f300 100644
--- a/skynet-src/socket_poll.h
+++ b/skynet-src/socket_poll.h
@@ -10,6 +10,7 @@ struct event {
 	bool read;
 	bool write;
 	bool error;
+	bool eof;
 };
 
 static bool sp_invalid(poll_fd fd);
diff --git a/skynet-src/socket_server.c b/skynet-src/socket_server.c
index 79158c5a..0ab233ba 100644
--- a/skynet-src/socket_server.c
+++ b/skynet-src/socket_server.c
@@ -1461,6 +1461,10 @@ socket_server_poll(struct socket_server *ss, struct socket_message * result, int
 				result->data = (char *)err;
 				return SOCKET_ERR;
 			}
+			if(e->eof) {
+				force_close(ss, s, &l, result);
+				return SOCKET_CLOSE;
+			}
 			break;
 		}
 	}