diff --git a/public/app/core/utils/rangeutil.ts b/public/app/core/utils/rangeutil.ts
index 3fc4252ceaf..dda67725208 100644
--- a/public/app/core/utils/rangeutil.ts
+++ b/public/app/core/utils/rangeutil.ts
@@ -133,12 +133,12 @@ _.each(rangeOptions, function (frame) {
       return from.fromNow() + ' to ' + formatDate(range.to);
     }
 
-    if (!moment.isMoment(range.from) && !moment.isMoment(range.to)) {
-      return formatDate(dateMath.parse(range.from, true)) + ' to ' + formatDate(dateMath.parse(range.to, true));
+    if (range.to.toString() === 'now') {
+      var res = describeTextRange(range.from);
+      return res.display;
     }
 
-    var res = describeTextRange(range.from);
-    return res.display;
+    return range.from.toString() + ' to ' + range.to.toString();
   }
 
 export = {