diff --git a/src/csv_export_util.js b/src/csv_export_util.js
index 7aed69a1f..886f32374 100644
--- a/src/csv_export_util.js
+++ b/src/csv_export_util.js
@@ -6,13 +6,15 @@ if(typeof window !== 'undefined'){
 function toString(data, keys) {
   var dataString = "";
   if (data.length === 0) return dataString;
-  
+
   dataString += keys.join(',') + '\n'
 
   data.map(function(row) {
-    keys.map(function(col) {
-      var cell = row[col] ? ('"'+row[col]+'"') : "";
-      dataString += cell + ',';
+    keys.map(function(col, i) {
+      let cell = typeof row[col] !== 'undefined' ? ('"'+row[col]+'"') : "";
+      dataString += cell;
+      if (i+1 < keys.length)
+        dataString += ',';
     });
 
     dataString += '\n';
@@ -26,7 +28,7 @@ var exportCSV = function(data, keys, filename) {
   if (typeof window !== 'undefined') {
     saveAs( new Blob([dataString], {type: "text/plain;charset=utf-8"}), filename || 'spreadsheet.csv' );
   }
-  
+
 };
 
 export default exportCSV;