diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9aa01b6..3bb38b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# demultiplex v0.3.2
+
+# Bug fixes
+
+* Ignore empty CSV entries when parsing sample information (PR #29).
+
 # demultiplex v0.3.1
 
 # Minor updates
diff --git a/src/dataflow/gather_fastqs_and_validate/main.nf b/src/dataflow/gather_fastqs_and_validate/main.nf
index ce8b90f..76c5d60 100644
--- a/src/dataflow/gather_fastqs_and_validate/main.nf
+++ b/src/dataflow/gather_fastqs_and_validate/main.nf
@@ -50,7 +50,10 @@ workflow run_wf {
               println "Found sample names column '${csv_items[sample_id_column_index]}'."
               return
             }
-            samples += csv_items[sample_id_column_index]
+            def candidate_sample_id = csv_items[sample_id_column_index]
+            if (candidate_sample_id?.trim()) { // Don't add empty csv entries.
+              samples += csv_items[sample_id_column_index]
+            }
           }
           // This return is important! (If 'true' is returned, the parsing stops.)
           return