diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 1bf7a72ebda6e..a74d80fd477dc 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -1089,8 +1089,9 @@ static int nfs4_server_common_setup(struct nfs_server *server,
 	 * Don't use NFS uid/gid mapping if we're using AUTH_SYS or lower
 	 * authentication.
 	 */
-	if (nfs4_disable_idmapping &&
-			server->client->cl_auth->au_flavor == RPC_AUTH_UNIX)
+	if (nfs4_disable_idmapping && (
+			server->client->cl_auth->au_flavor == RPC_AUTH_UNIX
+			|| server->client->cl_auth->au_flavor == RPC_AUTH_MARIUX ))
 		server->caps |= NFS_CAP_UIDGID_NOMAP;