diff --git a/go.mod b/go.mod
index 4e9cc01470b..47025e4f09e 100644
--- a/go.mod
+++ b/go.mod
@@ -93,7 +93,7 @@ require (
 	github.com/uber/jaeger-client-go v2.29.1+incompatible
 	github.com/unknwon/com v1.0.1
 	github.com/urfave/cli/v2 v2.3.0
-	github.com/vectordotdev/go-datemath v0.1.1-0.20220110192739-f9ce83ec349f
+	github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae
 	github.com/weaveworks/common v0.0.0-20210913144402-035033b78a78
 	github.com/xorcare/pointer v1.1.0
 	github.com/yudai/gojsondiff v1.0.0
diff --git a/go.sum b/go.sum
index 665845a11d3..d61f62786e5 100644
--- a/go.sum
+++ b/go.sum
@@ -2362,6 +2362,8 @@ github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vectordotdev/go-datemath v0.1.1-0.20220110192739-f9ce83ec349f h1:2upw/ZfjkCKpc4k6DXg7lMfCSLkfw/8epV5/y2ZUQ8U=
 github.com/vectordotdev/go-datemath v0.1.1-0.20220110192739-f9ce83ec349f/go.mod h1:PnwzbSst7KD3vpBzzlntZU5gjVa455Uqa5QPiKSYJzQ=
+github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae h1:oyiy3uBj1F4O3AaFh7hUGBrJjAssJhKyAbwxtkslxqo=
+github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae/go.mod h1:PnwzbSst7KD3vpBzzlntZU5gjVa455Uqa5QPiKSYJzQ=
 github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
 github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5/go.mod h1:ppEjwdhyy7Y31EnHRDm1JkChoC7LXIJ7Ex0VYLWtZtQ=
 github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
diff --git a/pkg/tsdb/legacydata/time_range.go b/pkg/tsdb/legacydata/time_range.go
index 6c2d21d44c3..9f24e806bfe 100644
--- a/pkg/tsdb/legacydata/time_range.go
+++ b/pkg/tsdb/legacydata/time_range.go
@@ -158,11 +158,7 @@ func (t parsableTime) datemathOptions() []func(*datemath.Options) {
 		options = append(options, datemath.WithLocation(t.location))
 	}
 	if t.weekstart != nil {
-		weekstart := *t.weekstart
-		if weekstart > t.now.Weekday() {
-			weekstart = weekstart - 7
-		}
-		options = append(options, datemath.WithStartOfWeek(weekstart))
+		options = append(options, datemath.WithStartOfWeek(*t.weekstart))
 	}
 	if t.fiscalStartMonth != nil {
 		loc := time.UTC