diff --git a/app/modules/workspace/propertyType/date.js b/app/modules/workspace/propertyType/date.js
index ca9ebc2..50a3af9 100644
--- a/app/modules/workspace/propertyType/date.js
+++ b/app/modules/workspace/propertyType/date.js
@@ -111,10 +111,11 @@
         function renderDate() {
             if (vm.dateComparison !== null && vm.comparisonInput instanceof Date) {
                 var date = vm.comparisonInput;
+                var utcDate = moment.utc(date);
                 property.compare =
                     vm.allowedDateComparisons[vm.dateComparison].f
-                        .replace(/%input_start_of_day%/g, moment(date).hour(0).minute(0).second(0).format())
-                        .replace(/%input_end_of_day%/g, moment(date).hour(23).minute(59).second(59).format());
+                        .replace(/%input_start_of_day%/g, utcDate.clone().startOf('day').format())
+                        .replace(/%input_end_of_day%/g, utcDate.clone().endOf('day').format());
 
             } else {
                 property.compare = null;
@@ -122,4 +123,4 @@
         }
 
     }
-})();
\ No newline at end of file
+})();