diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8293cb39..1ff76e9c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - [#887](https://github.com/nf-core/eager/issues/887) Clarify what is considered 'ultra-short' reads in the help text of clip_readlength, for when you may wish to turn of length filtering during AdapterRemoval (♥ to @TCLamnidis for reporting)
 - [#889](https://github.com/nf-core/eager/issues/889) Remove/updated parameters from benchmarking test profiles (♥ to @TCLamnidis for reporting)
 - [#895](https://github.com/nf-core/eager/issues/895) Output documentation typo fix and added location of output docs in pipeline summary (♥ to @RodrigoBarquera for reporting)
+- [#897](https://github.com/nf-core/eager/issues/897) Fix pipeline crashing if no Kraken2 results generated (♥ to @alexandregilardet for reporting)
 
 ### `Dependencies`
 
diff --git a/docs/output.md b/docs/output.md
index dc3388f26..8acdbe1d4 100644
--- a/docs/output.md
+++ b/docs/output.md
@@ -701,6 +701,7 @@ Each module has it's own output directory which sit alongside the `MultiQC/` dir
     * the `*.kreport` which is the old report format, without distinct minimizer count information, used by some tools such as [Pavian](https://github.com/fbreitwieser/pavian)
     * the `*.kraken2_report` which is the new kraken report format, with the distinct minimizer count information.  
     * finally, the `*.kraken.out` file are the direct output of Kraken2
+    * ⚠️ If your sample has no hits, no kraken output files will be created for that sample!
 * `maltextract/`: this contains a `results` directory in which contains the output from MaltExtract - typically one folder for each filter type, an error and a log file. The characteristics of each node (e.g. damage, read lengths, edit distances - each in different txt formats) can be seen in each sub-folder of the filter folders. Output can be visualised either with the [HOPS postprocessing script](https://github.com/rhuebler/HOPS) or [MEx-IPA](https://github.com/jfy133/MEx-IPA)
 * `consensus_sequence/`: this contains three FASTA files from VCF2Genome of a consensus sequence based on the reference FASTA with each sample's unique modifications. The main FASTA is a standard file with bases not passing the specified thresholds as Ns. The two other FASTAS (`_refmod.fasta.gz`) and (`_uncertainity.fasta.gz`) are IUPAC uncertainty codes (rather than Ns) and a special number-based uncertainty system used for other downstream tools, respectively.
    `merged_bams/initial`: these contain the BAM files that would go into UDG-treatment specific BAM trimming. All libraries of the sample sample, **and** same UDG-treatment type will be in these BAM files.
diff --git a/main.nf b/main.nf
index 8f6e4a859..e22cb9f5f 100644
--- a/main.nf
+++ b/main.nf
@@ -3019,8 +3019,8 @@ process kraken {
   path(krakendb) from ch_krakendb
 
   output:
-  file "*.kraken.out" into ch_kraken_out
-  tuple prefix, path("*.kraken2_report") into ch_kraken_report, ch_kraken_for_multiqc
+  file "*.kraken.out" optional true into ch_kraken_out
+  tuple prefix, path("*.kraken2_report") optional true into ch_kraken_report, ch_kraken_for_multiqc
 
   script:
   prefix = fastq.baseName