diff --git a/src/metabase/driver/query_processor.clj b/src/metabase/driver/query_processor.clj
index bac85ad421d8d34da4ee5eedc22088aee943b0da..4085ec18c7fa53d6a8b3a62c5fa5674a0923f6ea 100644
--- a/src/metabase/driver/query_processor.clj
+++ b/src/metabase/driver/query_processor.clj
@@ -148,7 +148,10 @@
   (for [row rows]
     (for [v row]
       (if (u/is-temporal? v)
-        (u/->iso-8601-datetime v report-timezone)
+        ;; NOTE: if we don't have an explicit report-timezone then use the JVM timezone
+        ;;       this ensures alignment between the way dates are processed by JDBC and our returned data
+        ;;       GH issues: #2282, #2035
+        (u/->iso-8601-datetime v (or report-timezone (System/getProperty "user.timezone")))
         v))))
 
 (defn- post-format-rows