diff --git a/modules/ui/src/app/app.component.html b/modules/ui/src/app/app.component.html
index 05aa65748..1f984a388 100644
--- a/modules/ui/src/app/app.component.html
+++ b/modules/ui/src/app/app.component.html
@@ -278,7 +278,7 @@ <h1 class="main-heading">Testrun</h1>
       [data]="HelpTips.step4"
       [target]="riskAssessmentTipTarget"
       (onCLoseTip)="onCLoseTip($event)"
-      (onAction)="navigateToRiskAssessment()">
+      (onAction)="navigateToAddRiskAssessment()">
     </app-help-tip>
   </div>
 </ng-template>
diff --git a/modules/ui/src/app/app.component.ts b/modules/ui/src/app/app.component.ts
index c4db44cc3..a330ac3ae 100644
--- a/modules/ui/src/app/app.component.ts
+++ b/modules/ui/src/app/app.component.ts
@@ -267,14 +267,6 @@ export class AppComponent implements AfterViewInit {
     this.route.navigate([Routes.Devices]);
   }
 
-  navigateToRiskAssessment(): void {
-    this.route.navigate([Routes.RiskAssessment]).then(() => {
-      this.appStore.setFocusOnPage(
-        window.document.querySelector('app-risk-assessment')
-      );
-    });
-  }
-
   navigateToSettings(): void {
     this.route.navigate([Routes.Settings]).then(() => {
       timer(100).subscribe(() => {