diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/AnalyticsHubTimeRangeSelection.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/AnalyticsHubTimeRangeSelection.swift
index 9ea8b17464e..14a05eb0048 100644
--- a/WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/AnalyticsHubTimeRangeSelection.swift	
+++ b/WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/AnalyticsHubTimeRangeSelection.swift	
@@ -29,11 +29,10 @@ public class AnalyticsHubTimeRangeSelection {
         return previousTimeRangeDescription
     }
 
-    //TODO: abandon usage of the ISO 8601 Calendar and build one based on the Site calendar configuration
     init(selectionType: SelectionType,
          currentDate: Date = Date(),
-         timezone: TimeZone = TimeZone.autoupdatingCurrent,
-         calendar: Calendar = Calendar(identifier: .iso8601)) {
+         timezone: TimeZone = TimeZone.current,
+         calendar: Calendar = Locale.current.calendar) {
         var selectionData: AnalyticsHubTimeRangeData
 
         switch selectionType {