diff --git a/src/Api/Controllers/EventsController.cs b/src/Api/Controllers/EventsController.cs
index a866cbf9fc..fbd99d95b9 100644
--- a/src/Api/Controllers/EventsController.cs
+++ b/src/Api/Controllers/EventsController.cs
@@ -58,23 +58,12 @@ namespace Bit.Api.Controllers
 
         private Tuple<DateTime, DateTime> GetDateRange(DateTime? start, DateTime? end)
         {
-            var endSet = false;
-            if(!end.HasValue)
+            if(!end.HasValue || !start.HasValue)
             {
-                endSet = true;
                 end = DateTime.UtcNow.Date.AddDays(1).AddMilliseconds(-1);
+                start = DateTime.UtcNow.Date.AddDays(-30);
             }
-
-            if(!start.HasValue)
-            {
-                start = end.Value.AddDays(-30);
-                if(endSet)
-                {
-                    start = start.Value.AddMilliseconds(1);
-                }
-            }
-
-            if(start.Value > end.Value)
+            else if(start.Value > end.Value)
             {
                 var newEnd = start;
                 start = end;
diff --git a/src/Core/Utilities/CoreHelpers.cs b/src/Core/Utilities/CoreHelpers.cs
index 486adfc6d3..325187629d 100644
--- a/src/Core/Utilities/CoreHelpers.cs
+++ b/src/Core/Utilities/CoreHelpers.cs
@@ -417,7 +417,7 @@ namespace Bit.Core.Utilities
                 date = DateTime.UtcNow;
             }
 
-            return date.Value.ToString("yyyy-MM-dd HH:mm:ss.fff");
+            return date.Value.ToUniversalTime().ToString("yyyy-MM-dd HH:mm:ss.fff");
         }
     }
 }