diff --git a/public/app/features/trails/Breakdown/LayoutSwitcher.tsx b/public/app/features/trails/Breakdown/LayoutSwitcher.tsx
index 93dfb59de01..8d573c1c11f 100644
--- a/public/app/features/trails/Breakdown/LayoutSwitcher.tsx
+++ b/public/app/features/trails/Breakdown/LayoutSwitcher.tsx
@@ -40,7 +40,7 @@ export class LayoutSwitcher extends SceneObjectBase<LayoutSwitcherState> impleme
 
   updateFromUrl(values: SceneObjectUrlValues) {
     const newBreakdownLayout = values.breakdownLayout;
-    if (newBreakdownLayout === 'string' && isBreakdownLayoutType(newBreakdownLayout)) {
+    if (typeof newBreakdownLayout === 'string' && isBreakdownLayoutType(newBreakdownLayout)) {
       if (this.state.activeBreakdownLayout !== newBreakdownLayout) {
         this.setState({ activeBreakdownLayout: newBreakdownLayout });
       }
diff --git a/public/app/features/trails/utils.ts b/public/app/features/trails/utils.ts
index 758f560edfb..c96e5099f41 100644
--- a/public/app/features/trails/utils.ts
+++ b/public/app/features/trails/utils.ts
@@ -97,7 +97,7 @@ export function getDatasourceForNewTrail(): string | undefined {
   const prevTrail = getTrailStore().recent[0];
   if (prevTrail) {
     const prevDataSource = sceneGraph.interpolate(prevTrail.resolve(), VAR_DATASOURCE_EXPR);
-    if (typeof prevDataSource === 'string' && prevDataSource.length > 0) {
+    if (prevDataSource.length > 0) {
       return prevDataSource;
     }
   }