diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 03cf8faf51b9f701180748131907ae803d4a5160..b2e876bf0decfb77a0b887616f6291b37d289718 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2410,7 +2410,8 @@ void ext4_insert_dentry(struct inode *inode,
 			struct ext4_filename *fname);
 static inline void ext4_update_dx_flag(struct inode *inode)
 {
-	if (!ext4_has_feature_dir_index(inode->i_sb)) {
+	if (!ext4_has_feature_dir_index(inode->i_sb) &&
+	    ext4_test_inode_flag(inode, EXT4_INODE_INDEX)) {
 		/* ext4_iget() should have caught this... */
 		WARN_ON_ONCE(ext4_has_feature_metadata_csum(inode->i_sb));
 		ext4_clear_inode_flag(inode, EXT4_INODE_INDEX);