diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index d793e597c0623e9ec09d1e14bf641bce992a2fa4..280e991e61f47cfc64a980dade537cc1c19474d2 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4832,6 +4832,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 		sbi->s_ea_block_cache = NULL;
 	}
 	if (sbi->s_journal) {
+		flush_work(&sbi->s_error_work);
 		jbd2_journal_destroy(sbi->s_journal);
 		sbi->s_journal = NULL;
 	}