diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index 15e8566f75..a261c4c37c 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -535,8 +535,8 @@ class timesheet_ui extends timesheet_bo
 		unset($query['col_filter'][0]);
 
 		// query cf's for the displayed rows
-		if ($ids && $this->customfields &&
-			in_array('customfields',$cols_to_show=explode(',',$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['nextmatch-timesheet.index.rows'])))
+		if ($ids && $this->customfields && ($query_in['csv_export'] ||
+			in_array('customfields',$cols_to_show=explode(',',$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['nextmatch-timesheet.index.rows']))))
 		{
 			$cfs = $this->read_cfs($ids,$cols_to_show);
 		}