diff --git a/pkg/ui/workspaces/db-console/src/redux/timeScale.ts b/pkg/ui/workspaces/db-console/src/redux/timeScale.ts
index 8f16c66bb95a..8e7b3ddbd926 100644
--- a/pkg/ui/workspaces/db-console/src/redux/timeScale.ts
+++ b/pkg/ui/workspaces/db-console/src/redux/timeScale.ts
@@ -66,7 +66,14 @@ export class TimeScaleState {
   constructor() {
     let timeScale: TimeScale;
     try {
-      timeScale = getValueFromSessionStorage(TIME_SCALE_SESSION_STORAGE_KEY);
+      const val = getValueFromSessionStorage(TIME_SCALE_SESSION_STORAGE_KEY);
+      timeScale = {
+        key: val.key,
+        windowSize: val.windowSize && moment.duration(val.windowSize),
+        windowValid: val.windowValid && moment.duration(val.windowValid),
+        sampleSize: val.sampleSize && moment.duration(val.sampleSize),
+        fixedWindowEnd: val.fixedWindowEnd && moment(val.fixedWindowEnd),
+      };
     } catch {
       console.warn(
         `Couldn't retrieve or parse TimeScale options from SessionStorage`,