diff --git a/public/app/core/directives/metric_segment.js b/public/app/core/directives/metric_segment.js
index 2e9442c15a0..37352556819 100644
--- a/public/app/core/directives/metric_segment.js
+++ b/public/app/core/directives/metric_segment.js
@@ -79,7 +79,9 @@ function (_, $, coreModule) {
           $scope.$apply(function() {
             $scope.getOptions({ $query: query }).then(function(altSegments) {
               $scope.altSegments = altSegments;
-              options = _.map($scope.altSegments, function(alt) { return alt.value; });
+              options = _.map($scope.altSegments, function(alt) {
+                return _.escape(alt.value);
+              });
 
               // add custom values
               if (segment.custom !== 'false') {