diff --git a/lib/cartodb/utils/date-wrapper.js b/lib/cartodb/utils/date-wrapper.js
index 895cb7c8..60e88001 100644
--- a/lib/cartodb/utils/date-wrapper.js
+++ b/lib/cartodb/utils/date-wrapper.js
@@ -35,19 +35,20 @@ function _castColumnToEpoch(columnName) {
 }
 
 function getColumnsWithWrappedDates(query) {
-    if (query) {
-        if (query.match(/\b_cdb_epoch_transformation\b/)) {
-            const columns = [];
-            const fieldMatcher = /\bdate_part\('epoch', "([^"]+)"\) as "([^"]+)"/gmi;
-            let match;
-            do {
-                match = fieldMatcher.exec(query);
-                if (match && match[1] === match[2]) {
-                    columns.push(match[1]);
-                }
-            } while (match);
-            return columns;
-        }
+    if(!query){
+        return;
+    }
+    if (query.match(/\b_cdb_epoch_transformation\b/)) {
+        const columns = [];
+        const fieldMatcher = /\bdate_part\('epoch', "([^"]+)"\) as "([^"]+)"/gmi;
+        let match;
+        do {
+            match = fieldMatcher.exec(query);
+            if (match && match[1] === match[2]) {
+                columns.push(match[1]);
+            }
+        } while (match);
+        return columns;
     }
 }