diff --git a/dorado/cli/demux.cpp b/dorado/cli/demux.cpp
index 162b7ec6..974fa6cd 100644
--- a/dorado/cli/demux.cpp
+++ b/dorado/cli/demux.cpp
@@ -161,6 +161,7 @@ int demuxer(int argc, char* argv[]) {
     auto emit_summary = parser.visible.get<bool>("emit-summary");
     auto threads(parser.visible.get<int>("threads"));
     auto max_reads(parser.visible.get<int>("max-reads"));
+    auto no_classify(parser.visible.get<bool>("--no-classify"));
 
     alignment::AlignmentProcessingItems processing_items{reads, recursive_input, output_dir, true};
     if (!processing_items.initialise()) {
@@ -213,7 +214,7 @@ int demuxer(int argc, char* argv[]) {
     }
 
     add_pg_hdr(header.get());
-    if (!no_trim) {
+    if (!no_classify && !no_trim) {
         // Remove SQ lines from header since alignment information
         // is invalidated after trimming.
         utils::strip_alignment_data_from_header(header.get());
diff --git a/tests/test_simple_basecaller_execution.sh b/tests/test_simple_basecaller_execution.sh
index 1c6c134e..3cf3841f 100755
--- a/tests/test_simple_basecaller_execution.sh
+++ b/tests/test_simple_basecaller_execution.sh
@@ -345,6 +345,7 @@ for bam in $output_dir/demux_only_test/SQK-RBK114-96_barcode01.bam $output_dir/d
         echo "Missing expected bam file $bam"
         exit 1
     fi
+    samtools view $bam > /dev/null
 done
 
 rm -rf $output_dir