diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 3387e6d639a5453fdc02f72040f9bc9ccf625eab..f3281f0b2388c48b92f1d2901692f2a168f12a5a 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -968,7 +968,8 @@ static int ovl_make_workdir(struct ovl_fs *ofs, struct path *workpath)
 	err = ovl_do_setxattr(ofs->workdir, OVL_XATTR_OPAQUE, "0", 1, 0);
 	if (err) {
 		ofs->noxattr = true;
-		pr_warn("overlayfs: upper fs does not support xattr.\n");
+		ofs->config.index = false;
+		pr_warn("overlayfs: upper fs does not support xattr, falling back to index=off.\n");
 		err = 0;
 	} else {
 		vfs_removexattr(ofs->workdir, OVL_XATTR_OPAQUE);