diff --git a/main.go b/main.go
index 25dfe17..1248014 100644
--- a/main.go
+++ b/main.go
@@ -230,7 +230,7 @@ func (h *stopDeparturesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request
 	if timeFromStr == "" {
 		timeFrom = time.Now()
 	} else {
-		timeFrom, err = time.Parse("2006-01-02T15:04:05-0700", timeFromStr)
+		timeFrom, err = time.Parse(time.RFC3339, timeFromStr)
 	}
 
 	timeFromPg := pgtype.Timestamptz{Time: timeFrom, Valid: true}
@@ -247,7 +247,7 @@ func (h *stopDeparturesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request
 	if timeToStr == "" {
 		timeTo = timeFrom.Add(time.Duration(duration) * time.Minute)
 	} else {
-		timeTo, err = time.Parse("2006-01-02T15:04:05-0700", timeToStr)
+		timeTo, err = time.Parse(time.RFC3339, timeFromStr)
 	}
 	timeToPg := pgtype.Timestamptz{Time: timeTo, Valid: true}
 
@@ -257,7 +257,7 @@ func (h *stopDeparturesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request
 	if timeRtUpdateStr == "" {
 		timeRtUpdate = time.Now().Add(time.Duration(48) * time.Hour)
 	} else {
-		timeRtUpdate, err = time.Parse("2006-01-02T15:04:05-0700", timeRtUpdateStr)
+		timeRtUpdate, err = time.Parse(time.RFC3339, timeFromStr)
 	}
 	timeRtUpdatePg := pgtype.Timestamptz{Time: timeRtUpdate, Valid: true}