diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index b138902fd42ca8a6a0eb2c6ae7d04f34754a951a..4d34e2b33fa0dd2dc40e966f91814df53868d416 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -6624,7 +6624,8 @@ static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode,
 	 */
 	if (ext4_handle_valid(handle) &&
 	    ((flags & EXT4_FREE_BLOCKS_METADATA) ||
-	     !ext4_should_writeback_data(inode))) {
+	     !ext4_should_writeback_data(inode) ||
+	     ext4_test_inode_state(inode, EXT4_STATE_BUFFERED_IOMAP))) {
 		struct ext4_free_data *new_entry;
 		/*
 		 * We use __GFP_NOFAIL because ext4_free_blocks() is not allowed