diff --git a/pkg/ui/workspaces/cluster-ui/src/timeScaleDropdown/timeScaleDropdown.tsx b/pkg/ui/workspaces/cluster-ui/src/timeScaleDropdown/timeScaleDropdown.tsx index a5c0adb74b3b..8db97d5f8c38 100644 --- a/pkg/ui/workspaces/cluster-ui/src/timeScaleDropdown/timeScaleDropdown.tsx +++ b/pkg/ui/workspaces/cluster-ui/src/timeScaleDropdown/timeScaleDropdown.tsx @@ -270,6 +270,9 @@ export const getValidOption = ( currentScale: TimeScale, options: TimeScaleOptions, ): TimeScale => { + if (currentScale.key === "Custom") { + return currentScale; + } if (!(currentScale.key in options)) { const firstValidKey = Object.keys(options)[0]; return {