diff --git a/lib/cartodb/utils/date-wrapper.js b/lib/cartodb/utils/date-wrapper.js
index 9d5657b1..3d458978 100644
--- a/lib/cartodb/utils/date-wrapper.js
+++ b/lib/cartodb/utils/date-wrapper.js
@@ -14,7 +14,7 @@ const DATE_OIDS = Object.freeze({
 function wrapDates(originalQuery, fields) {
     return `
         SELECT
-            ${fields.map(field =>  _isDateType(field) ? _castColumnToEpoch(field.name) : `${field.name}`).join(',')}
+            ${fields.map(field =>  _isDateType(field) ? _castColumnToEpoch(field.name) : `"${field.name}"`).join(',')}
         FROM
             (${originalQuery}) _cdb_epoch_transformation `;
 }