diff --git a/pkg/tsdb/calculator.go b/pkg/tsdb/calculator.go
index 2716c7cc8bc..213a5a68908 100644
--- a/pkg/tsdb/calculator.go
+++ b/pkg/tsdb/calculator.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/components/gtime"
 	"github.com/grafana/grafana/pkg/tsdb/interval"
 )
 
@@ -90,7 +91,7 @@ func GetIntervalFrom(dsInterval, queryInterval string, queryIntervalMS int64, de
 	if isPureNum {
 		interval += "s"
 	}
-	parsedInterval, err := time.ParseDuration(interval)
+	parsedInterval, err := gtime.ParseDuration(interval)
 	if err != nil {
 		return time.Duration(0), err
 	}
diff --git a/pkg/tsdb/interval/interval.go b/pkg/tsdb/interval/interval.go
index 5ce318e31ac..addc7385133 100644
--- a/pkg/tsdb/interval/interval.go
+++ b/pkg/tsdb/interval/interval.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/grafana/grafana/pkg/components/gtime"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
@@ -97,7 +98,7 @@ func GetIntervalFrom(dsInfo *models.DataSource, queryModel *simplejson.Json, def
 	if isPureNum {
 		interval += "s"
 	}
-	parsedInterval, err := time.ParseDuration(interval)
+	parsedInterval, err := gtime.ParseDuration(interval)
 	if err != nil {
 		return time.Duration(0), err
 	}