diff --git a/fs/ext4/orphan.c b/fs/ext4/orphan.c
index 646c3077b6d2..b4675aa7ea96 100644
--- a/fs/ext4/orphan.c
+++ b/fs/ext4/orphan.c
@@ -389,7 +389,7 @@ void ext4_orphan_cleanup(struct super_block *sb, struct ext4_super_block *es)
 	struct ext4_orphan_info *oi = &EXT4_SB(sb)->s_orphan_info;
 	int inodes_per_ob = ext4_inodes_per_orphan_block(sb);
 
-	if (!es->s_last_orphan && !oi->of_blocks) {
+	if (!es->s_last_orphan && ext4_orphan_file_empty(sb)) {
 		ext4_debug("no orphan inodes to clean up\n");
 		return;
 	}