diff --git a/public/app/plugins/datasource/tempo/datasource.test.ts b/public/app/plugins/datasource/tempo/datasource.test.ts
index 957eefec24a..85f67b97a44 100644
--- a/public/app/plugins/datasource/tempo/datasource.test.ts
+++ b/public/app/plugins/datasource/tempo/datasource.test.ts
@@ -434,8 +434,8 @@ describe('Tempo data source', () => {
       [{ refId: 'refid1', queryType: 'traceql', query: '' } as TempoQuery]
     );
 
-    expect(request.range.from.unix()).toBe(dateTime(0).unix());
-    expect(request.range.to.unix()).toBe(dateTime(0).unix());
+    expect(request.range.from.unix()).toBe(dateTime(new Date(2022, 8, 13, 16, 0, 0, 0)).unix());
+    expect(request.range.to.unix()).toBe(dateTime(new Date(2022, 8, 13, 16, 15, 0, 0)).unix());
   });
 });
 
diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts
index e69237518c0..1624e47efb5 100644
--- a/public/app/plugins/datasource/tempo/datasource.ts
+++ b/public/app/plugins/datasource/tempo/datasource.ts
@@ -12,7 +12,6 @@ import {
   DataQueryResponseData,
   DataSourceGetTagValuesOptions,
   DataSourceInstanceSettings,
-  dateTime,
   FieldType,
   LoadingState,
   rangeUtil,
@@ -666,18 +665,18 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
       targets,
     };
 
-    if (this.traceQuery?.timeShiftEnabled) {
-      request.range = options.range && {
-        ...options.range,
-        from: options.range.from.subtract(
-          rangeUtil.intervalToMs(this.traceQuery?.spanStartTimeShift || '30m'),
-          'milliseconds'
-        ),
-        to: options.range.to.add(rangeUtil.intervalToMs(this.traceQuery?.spanEndTimeShift || '30m'), 'milliseconds'),
-      };
-    } else {
-      request.range = { from: dateTime(0), to: dateTime(0), raw: { from: dateTime(0), to: dateTime(0) } };
-    }
+    request.range = options.range && {
+      ...options.range,
+      from: this.traceQuery?.timeShiftEnabled
+        ? options.range.from.subtract(
+            rangeUtil.intervalToMs(this.traceQuery?.spanStartTimeShift || '30m'),
+            'milliseconds'
+          )
+        : options.range.from,
+      to: this.traceQuery?.timeShiftEnabled
+        ? options.range.to.add(rangeUtil.intervalToMs(this.traceQuery?.spanEndTimeShift || '30m'), 'milliseconds')
+        : options.range.to,
+    };
 
     return request;
   }