diff --git a/source3/rpc_server/rpc_server.h b/source3/rpc_server/rpc_server.h
index 35f85e97f4f..5842b7663fd 100644
--- a/source3/rpc_server/rpc_server.h
+++ b/source3/rpc_server/rpc_server.h
@@ -39,7 +39,6 @@ struct dcerpc_ncacn_conn {
 	dcerpc_ncacn_termination_fn termination_fn;
 	void *termination_data;
 
-	struct messaging_context *msg_ctx;
 	struct dcesrv_context *dce_ctx;
 	struct dcesrv_endpoint *endpoint;
 
diff --git a/source3/rpc_server/rpc_worker.c b/source3/rpc_server/rpc_worker.c
index d1b7b05eb20..4bd9c7221b0 100644
--- a/source3/rpc_server/rpc_worker.c
+++ b/source3/rpc_server/rpc_worker.c
@@ -249,7 +249,6 @@ static void rpc_worker_new_client(
 		goto fail;
 	}
 	*ncacn_conn = (struct dcerpc_ncacn_conn) {
-		.msg_ctx = global_messaging_context(),
 		.dce_ctx = dce_ctx,
 		.endpoint = ep,
 		.sock = sock,
@@ -390,7 +389,7 @@ static void rpc_worker_new_client(
 		DBG_DEBUG("talloc failed\n");
 		goto fail;
 	}
-	ncacn_conn->p->msg_ctx = ncacn_conn->msg_ctx;
+	ncacn_conn->p->msg_ctx = global_messaging_context();
 	ncacn_conn->p->transport = transport;
 
 	status = dcesrv_endpoint_connect(