diff --git a/pkg/models/task_collection_filter.go b/pkg/models/task_collection_filter.go
index 8237b9281..fa5e11f75 100644
--- a/pkg/models/task_collection_filter.go
+++ b/pkg/models/task_collection_filter.go
@@ -62,6 +62,21 @@ type taskFilter struct {
 	join       taskFilterConcatinator
 }
 
+// adjustDateForMysql adjusts dates with year < 1 to be compatible with MySQL/MariaDB.
+// MySQL does not support dates where year < 1. We set the year to 1 and add an extra day
+// if the date is January 1st to survive xorm's timezone conversion to GMT.
+func adjustDateForMysql(t time.Time) time.Time {
+	if db.GetDialect() != builder.MYSQL || t.Year() >= 1 {
+		return t
+	}
+	t = t.AddDate(1-t.Year(), 0, 0)
+	// Add extra day to survive timezone conversion to GMT (only needed for Jan 1st)
+	if t.Month() == 1 && t.Day() == 1 {
+		t = t.AddDate(0, 0, 1)
+	}
+	return t
+}
+
 func parseTimeFromUserInput(timeString string, loc *time.Location) (value time.Time, err error) {
 	value, err = time.ParseInLocation(time.RFC3339, timeString, loc)
 	if err != nil {
@@ -91,11 +106,7 @@ func parseTimeFromUserInput(timeString string, loc *time.Location) (value time.T
 		value = time.Date(year, time.Month(month), day, 0, 0, 0, 0, loc)
 	}
 	value = value.In(config.GetTimeZone())
-	// Mysql/Mariadb does not support date values where the year < 1. To make this edge-case work,
-	// we're setting the year to 1 in that case. This must be done after timezone conversion.
-	if db.GetDialect() == builder.MYSQL && value.Year() < 1 {
-		value = value.AddDate(1-value.Year(), 0, 0)
-	}
+	value = adjustDateForMysql(value)
 	return value, err
 }
 
@@ -297,11 +308,7 @@ func getValueForField(field reflect.StructField, rawValue string, loc *time.Loca
 			t, err = datemath.Parse(rawValue)
 			if err == nil {
 				tt = t.Time(datemath.WithLocation(loc)).In(config.GetTimeZone())
-				// Mysql/Mariadb does not support date values where the year < 1. To make this edge-case work,
-				// we're setting the year to 1 in that case. This must be done after timezone conversion.
-				if db.GetDialect() == builder.MYSQL && tt.Year() < 1 {
-					tt = tt.AddDate(1-tt.Year(), 0, 0)
-				}
+				tt = adjustDateForMysql(tt)
 			} else {
 				tt, err = parseTimeFromUserInput(rawValue, loc)
 			}