diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index e1a8a1a95c9..557143164a9 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -237,15 +237,11 @@ if ($action == 'export_csv') {
 	else
 	{
 		$accountancyexport = new AccountancyExport($db);
-		AccountancyExport::downloadFile();
 		$accountancyexport->export($object->lines);
 		if (!empty($accountancyexport->errors)) {
 			setEventMessages('', $accountancyexport->errors, 'errors');
 		}
-		else {
-			Header("Location: list.php");
-			exit;
-		}
+		exit;
 	}
 }
 
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index f85a6a54937..df17f15a1e4 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -113,6 +113,8 @@ class AccountancyExport
 	public function export(&$TData) {
 		global $conf, $langs;
 
+		self::downloadFile();
+
 		switch ($conf->global->ACCOUNTING_EXPORT_MODELCSV) {
 			case self::$EXPORT_TYPE_NORMAL :
 				$this->exportNormal($TData);
@@ -140,8 +142,7 @@ class AccountancyExport
 				break;
 		}
 
-		if (empty($this->errors))
-			self::downloadFile();
+
 	}
 
 	/**