diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index d793e597c0623e9ec09d1e14bf641bce992a2fa4..a051671f7cb89c1d26899e051593c7a8d8e99fec 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -646,7 +646,7 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error,
 		 * constraints, it may not be safe to do it right here so we
 		 * defer superblock flushing to a workqueue.
 		 */
-		if (continue_fs)
+		if (continue_fs && journal)
 			schedule_work(&EXT4_SB(sb)->s_error_work);
 		else
 			ext4_commit_super(sb);
@@ -4832,12 +4832,15 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 		sbi->s_ea_block_cache = NULL;
 	}
 	if (sbi->s_journal) {
+		/* flush s_error_work before journal destroy. */
+		flush_work(&sbi->s_error_work);
 		jbd2_journal_destroy(sbi->s_journal);
 		sbi->s_journal = NULL;
 	}
 failed_mount3a:
 	ext4_es_unregister_shrinker(sbi);
 failed_mount3:
+	/* flush s_error_work before sbi destroy */
 	flush_work(&sbi->s_error_work);
 	del_timer_sync(&sbi->s_err_report);
 	ext4_stop_mmpd(sbi);