diff --git a/pkg/tsdb/influxdb/model_parser.go b/pkg/tsdb/influxdb/model_parser.go
index 7085948f3d3..b2b7fc5489b 100644
--- a/pkg/tsdb/influxdb/model_parser.go
+++ b/pkg/tsdb/influxdb/model_parser.go
@@ -12,10 +12,7 @@ func (qp *InfluxdbQueryParser) Parse(model *simplejson.Json) (*Query, error) {
 	policy := model.Get("policy").MustString("default")
 	rawQuery := model.Get("query").MustString("")
 
-	measurement, err := model.Get("measurement").String()
-	if err != nil {
-		return nil, err
-	}
+	measurement := model.Get("measurement").MustString("")
 
 	resultFormat, err := model.Get("resultFormat").String()
 	if err != nil {
diff --git a/pkg/tsdb/influxdb/model_parser_test.go b/pkg/tsdb/influxdb/model_parser_test.go
index de8f6b58b5b..bcaaf706bd8 100644
--- a/pkg/tsdb/influxdb/model_parser_test.go
+++ b/pkg/tsdb/influxdb/model_parser_test.go
@@ -164,7 +164,7 @@ func TestInfluxdbQueryParser(t *testing.T) {
 			So(err, ShouldBeNil)
 			So(res.RawQuery, ShouldEqual, "RawDummieQuery")
 			So(len(res.GroupBy), ShouldEqual, 2)
-			So(len(res.Selects), ShouldEqual, 2)
+			So(len(res.Selects), ShouldEqual, 1)
 			So(len(res.Tags), ShouldEqual, 0)
 		})
 	})