diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index e9b8a68b350ae7a97296f3112d1310773898cd00..08bfde8280c7ae5541dd121cafec1be1c99241fb 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -721,6 +721,7 @@ static void __tun_detach(struct tun_file *tfile, bool clean)
 				   tun->tfiles[tun->numqueues - 1]);
 		ntfile = rtnl_dereference(tun->tfiles[index]);
 		ntfile->queue_index = index;
+		ntfile->xdp_rxq.queue_index = index;
 		rcu_assign_pointer(tun->tfiles[tun->numqueues - 1],
 				   NULL);