diff --git a/modules/ui/src/app/app.component.html b/modules/ui/src/app/app.component.html
index 8a1866102..11751ac0f 100644
--- a/modules/ui/src/app/app.component.html
+++ b/modules/ui/src/app/app.component.html
@@ -201,7 +201,8 @@ <h1 class="main-heading">Testrun</h1>
             vm.hasConnectionSettings === true &&
             vm.hasDevices === true &&
             vm.hasRiskProfiles === false &&
-            vm.systemStatus === StatusOfTestrun.InProgress
+            vm.systemStatus === StatusOfTestrun.InProgress &&
+            isRiskAssessmentRoute === false
           ">
           Congratulations, the device is under test now! Do not forget to fill
           <a
diff --git a/modules/ui/src/app/app.component.ts b/modules/ui/src/app/app.component.ts
index 52725f04f..185fcdd53 100644
--- a/modules/ui/src/app/app.component.ts
+++ b/modules/ui/src/app/app.component.ts
@@ -108,6 +108,10 @@ export class AppComponent {
     );
   }
 
+  get isRiskAssessmentRoute(): boolean {
+    return this.route.url === Routes.RiskAssessment;
+  }
+
   navigateToDeviceRepository(): void {
     this.route.navigate([Routes.Devices]);
     this.store.dispatch(setIsOpenAddDevice({ isOpenAddDevice: true }));