diff --git a/src/app/samples/samples.component.ts b/src/app/samples/samples.component.ts
index 51382ab..03266c6 100644
--- a/src/app/samples/samples.component.ts
+++ b/src/app/samples/samples.component.ts
@@ -198,9 +198,6 @@ export class SamplesComponent implements OnInit {
       query.push('page-size=' + this.filters.pageSize);
     }
     query.push('sort=' + this.filters.sort);
-    if (options.csv) {
-      query.push('output=csv');
-    }
     if (options.export) {
       query.push('key=' + this.d.d.userKey.key);
     }
@@ -230,7 +227,10 @@ export class SamplesComponent implements OnInit {
       });
     }
     else {
-      if (this.downloadFlatten) {
+      if (options.csv) {
+        query.push('output=csv');
+      }
+      else if (this.downloadFlatten) {
         query.push('output=flatten');
       }
       if (this.downloadSpectra) {