diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01ef2c4505b..6549e2d325f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 **Fixes**
 - [Issue #1832](https://github.com/grafana/grafana/issues/1832). Graph Panel + Legend Table mode: Many series casued zero height graph, now legend will never reduce the height of the graph below 50% of row height.
 - [Issue #1846](https://github.com/grafana/grafana/issues/1846). Snapshots: Fixed issue with snapshoting dashboards with an interval template variable
+- [Issue #1848](https://github.com/grafana/grafana/issues/1848). Panel timeshift: You can now use panel timeshift without a relative time override
 
 # 2.0.1 (2015-04-20)
 
diff --git a/public/app/features/panel/panelHelper.js b/public/app/features/panel/panelHelper.js
index 442bcbac8c5..39d8e00a9d6 100644
--- a/public/app/features/panel/panelHelper.js
+++ b/public/app/features/panel/panelHelper.js
@@ -43,7 +43,7 @@ function (angular, _, kbn, $) {
       }
 
       if (scope.panel.timeShift) {
-        if (!kbn.isValidTimeSpan(scope.panel.timeFrom)) {
+        if (!kbn.isValidTimeSpan(scope.panel.timeShift)) {
           scope.panelMeta.timeInfo = 'invalid timeshift';
           return;
         }