diff --git a/esp/src/src-react/components/Files.tsx b/esp/src/src-react/components/Files.tsx
index 6cc33214cbb..95cf41ee7b6 100644
--- a/esp/src/src-react/components/Files.tsx
+++ b/esp/src/src-react/components/Files.tsx
@@ -70,10 +70,12 @@ function formatQuery(_filter): { [id: string]: any } {
     delete filter.NotInSuperFiles;
     delete filter.Indexes;
     if (filter.StartDate) {
+        if (filter.StartDate.indexOf("Z") < 0) { filter.StartDate += ":00.000Z"; }
         filter.StartDate = new Date(filter.StartDate).toISOString();
     }
     if (filter.EndDate) {
-        filter.EndDate = new Date(filter.StartDate).toISOString();
+        if (filter.EndDate.indexOf("Z") < 0) { filter.EndDate += ":00.000Z"; }
+        filter.EndDate = new Date(filter.EndDate).toISOString();
     }
     return filter;
 }
diff --git a/esp/src/src/ESPWorkunit.ts b/esp/src/src/ESPWorkunit.ts
index 0b7713df67f..1efadc5afc1 100644
--- a/esp/src/src/ESPWorkunit.ts
+++ b/esp/src/src/ESPWorkunit.ts
@@ -124,9 +124,11 @@ export function formatQuery(_filter): { [id: string]: any } {
         delete filter.LastNDays;
     } else {
         if (filter.StartDate) {
+            if (filter.StartDate.indexOf("Z") < 0) { filter.StartDate += ":00.000Z"; }
             filter.StartDate = new Date(filter.StartDate).toISOString();
         }
         if (filter.EndDate) {
+            if (filter.EndDate.indexOf("Z") < 0) { filter.EndDate += ":00.000Z"; }
             filter.EndDate = new Date(filter.EndDate).toISOString();
         }
     }