diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index a236e606fa9591f521c9d4d523c6898eca637fac..dd6f3e02af4f2ea2e7b1b41d92cdb562b96bb867 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -2401,7 +2401,7 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
 				 * external inode if possible.
 				 */
 				if (ext4_has_feature_ea_inode(inode->i_sb) &&
-				    !i.in_inode) {
+				    i.value_len && !i.in_inode) {
 					i.in_inode = 1;
 					goto retry_inode;
 				}