diff --git a/public/app/core/services/segment_srv.js b/public/app/core/services/segment_srv.js
index 9d13e8e27e3..096697052ce 100644
--- a/public/app/core/services/segment_srv.js
+++ b/public/app/core/services/segment_srv.js
@@ -23,6 +23,9 @@ function (angular, _, coreModule) {
         return;
       }
 
+      // temp hack to work around legacy inconsistency in segment model
+      this.text = options.value;
+
       this.cssClass = options.cssClass;
       this.custom = options.custom;
       this.type = options.type;
@@ -79,7 +82,7 @@ function (angular, _, coreModule) {
     this.transformToSegments = function(addTemplateVars, variableTypeFilter) {
       return function(results) {
         var segments = _.map(results, function(segment) {
-          return self.newSegment({ value: segment.text, expandable: segment.expandable });
+          return self.newSegment({value: segment.text, expandable: segment.expandable});
         });
 
         if (addTemplateVars) {
diff --git a/public/app/plugins/datasource/graphite/query_ctrl.ts b/public/app/plugins/datasource/graphite/query_ctrl.ts
index 30f17554d2b..724a8247f91 100644
--- a/public/app/plugins/datasource/graphite/query_ctrl.ts
+++ b/public/app/plugins/datasource/graphite/query_ctrl.ts
@@ -161,7 +161,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
 
     return this.datasource.metricFindQuery(query).then(segments => {
       var altSegments = _.map(segments, segment => {
-        return this.uiSegmentSrv.newSegment({ value: segment.text, expandable: segment.expandable });
+        return this.uiSegmentSrv.newSegment({value: segment.text, expandable: segment.expandable});
       });
 
       if (altSegments.length === 0) { return altSegments; }