diff --git a/src/add-ons/kernel/network/stack/net_socket.cpp b/src/add-ons/kernel/network/stack/net_socket.cpp
index 1d9dc3186e..0a223dcc4b 100644
--- a/src/add-ons/kernel/network/stack/net_socket.cpp
+++ b/src/add-ons/kernel/network/stack/net_socket.cpp
@@ -914,15 +914,21 @@ socket_notify(net_socket* _socket, uint8 event, int32 value)
 
 		case B_SELECT_ERROR:
 			socket->error = value;
-			event |= B_SELECT_READ | B_SELECT_WRITE;
 			break;
 	}
 
 	MutexLocker _(socket->lock);
 
-	if (notify && socket->select_pool != NULL)
+	if (notify && socket->select_pool != NULL) {
 		notify_select_event_pool(socket->select_pool, event);
 
+		if (event == B_SELECT_ERROR) {
+			// always notify read/write on error
+			notify_select_event_pool(socket->select_pool, B_SELECT_READ);
+			notify_select_event_pool(socket->select_pool, B_SELECT_WRITE);
+		}
+	}
+
 	return B_OK;
 }