diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 3ebacd15bd94..1d8d8491f155 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3851,6 +3851,8 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
 free_stats:
 	f2fs_destroy_stats(sbi);
 free_nm:
+	/* stop discard thread before destroying node manager */
+	f2fs_stop_discard_thread(sbi);
 	f2fs_destroy_node_manager(sbi);
 free_sm:
 	f2fs_destroy_segment_manager(sbi);