diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index d2ec3c987f0fed89bd7da14db245ba1dd38eb145..a772ceff9c1f433a2480a35da2db7cb6dd0c8443 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -702,7 +702,8 @@ static void __tun_detach(struct tun_file *tfile, bool clean)
 	tun = rtnl_dereference(tfile->tun);
 
 	if (tun && clean) {
-		tun_napi_disable(tfile);
+		if (!tfile->detached)
+			tun_napi_disable(tfile);
 		tun_napi_del(tfile);
 	}