diff --git a/public/app/features/trails/DataTrailsHistory.tsx b/public/app/features/trails/DataTrailsHistory.tsx
index 241e0cc662d..eec93218927 100644
--- a/public/app/features/trails/DataTrailsHistory.tsx
+++ b/public/app/features/trails/DataTrailsHistory.tsx
@@ -200,7 +200,7 @@ export class DataTrailHistory extends SceneObjectBase<DataTrailsHistoryState> {
                   // Specifics per step type
                   styles.stepTypes[stepType],
                   // To highlight selected step
-                  model.state.currentStep === index ? styles.stepSelected : '',
+                  currentStep === index ? styles.stepSelected : '',
                   // To alter the look of steps with distant non-directly preceding parent
                   alternatePredecessorStyle.get(index) ?? '',
                   // To remove direct link for steps that don't have a direct parent
diff --git a/public/app/features/trails/MetricSelect/MetricSelectScene.tsx b/public/app/features/trails/MetricSelect/MetricSelectScene.tsx
index 2c3f7001d4e..2acd179d229 100644
--- a/public/app/features/trails/MetricSelect/MetricSelectScene.tsx
+++ b/public/app/features/trails/MetricSelect/MetricSelectScene.tsx
@@ -369,7 +369,7 @@ export class MetricSelectScene extends SceneObjectBase<MetricSelectSceneState> {
           </Alert>
         )}
         <StatusWrapper {...{ isLoading, blockingMessage }}>
-          <model.state.body.Component model={model.state.body} />
+          <body.Component model={body} />
         </StatusWrapper>
       </div>
     );
diff --git a/public/app/features/trails/MetricSelect/SelectMetricAction.tsx b/public/app/features/trails/MetricSelect/SelectMetricAction.tsx
index 3ee10805115..187763264a6 100644
--- a/public/app/features/trails/MetricSelect/SelectMetricAction.tsx
+++ b/public/app/features/trails/MetricSelect/SelectMetricAction.tsx
@@ -16,9 +16,10 @@ export class SelectMetricAction extends SceneObjectBase<SelectMetricActionState>
   };
 
   public static Component = ({ model }: SceneComponentProps<SelectMetricAction>) => {
+    const { title } = model.useState();
     return (
       <Button variant="secondary" size="sm" fill="solid" onClick={model.onClick}>
-        {model.state.title}
+        {title}
       </Button>
     );
   };