diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c
index e4d7f0dfd9c..f02340c1789 100644
--- a/ctdb/tcp/tcp_connect.c
+++ b/ctdb/tcp/tcp_connect.c
@@ -339,7 +339,7 @@ static void ctdb_listen_event(struct tevent_context *ev, struct tevent_fd *fde,
 					   fd,
 					   CTDB_TCP_ALIGNMENT,
 					   ctdb_tcp_read_cb,
-					   tnode,
+					   node,
 					   "ctdbd-%s",
 					   ctdb_addr_to_str(&addr));
 	if (tnode->in_queue == NULL) {
diff --git a/ctdb/tcp/tcp_io.c b/ctdb/tcp/tcp_io.c
index e33ed44048e..e8ebff887e1 100644
--- a/ctdb/tcp/tcp_io.c
+++ b/ctdb/tcp/tcp_io.c
@@ -37,8 +37,9 @@
  */
 void ctdb_tcp_read_cb(uint8_t *data, size_t cnt, void *args)
 {
+	struct ctdb_node *node = talloc_get_type_abort(args, struct ctdb_node);
 	struct ctdb_tcp_node *tnode = talloc_get_type_abort(
-		args, struct ctdb_tcp_node);
+		node->private_data, struct ctdb_tcp_node);
 	struct ctdb_req_header *hdr = (struct ctdb_req_header *)data;
 
 	if (data == NULL) {
@@ -77,6 +78,8 @@ failed:
 	TALLOC_FREE(tnode->in_queue);
 	close(tnode->in_fd);
 	tnode->in_fd = -1;
+	node->ctdb->upcalls->node_dead(node);
+
 	TALLOC_FREE(data);
 }