diff --git a/modules/ui/src/app/app.component.html b/modules/ui/src/app/app.component.html
index 0475b03d6..d7d51f8ef 100644
--- a/modules/ui/src/app/app.component.html
+++ b/modules/ui/src/app/app.component.html
@@ -172,7 +172,12 @@ <h1 class="main-heading">Testrun</h1>
         </app-callout>
         <app-callout
           [type]="CalloutType.Info"
-          *ngIf="vm.hasConnectionSettings === true && vm.hasDevices === false">
+          *ngIf="
+            vm.hasConnectionSettings === true &&
+            (vm.hasDevices === false ||
+              (!!vm.calloutState.get('outdated_devices_callout') &&
+                vm.isAllDevicesOutdated))
+          ">
           Step 2: To perform a device test please
           <a
             (click)="navigateToAddDevice()"
@@ -193,7 +198,8 @@ <h1 class="main-heading">Testrun</h1>
             vm.hasDevices &&
             (!vm.systemStatus || vm.systemStatus === StatusOfTestrun.Idle) &&
             vm.isStatusLoaded === true &&
-            !vm.reports.length
+            !vm.reports.length &&
+            !vm.isAllDevicesOutdated
           ">
           Step 3: Once device is created, you are able to
           <a
diff --git a/modules/ui/src/app/app.component.spec.ts b/modules/ui/src/app/app.component.spec.ts
index 6b285fd66..c99f8521b 100644
--- a/modules/ui/src/app/app.component.spec.ts
+++ b/modules/ui/src/app/app.component.spec.ts
@@ -58,6 +58,7 @@ import {
   selectHasRiskProfiles,
   selectInterfaces,
   selectInternetConnection,
+  selectIsAllDevicesOutdated,
   selectIsOpenStartTestrun,
   selectIsOpenWaitSnackBar,
   selectMenuOpened,
@@ -169,6 +170,7 @@ describe('AppComponent', () => {
             { selector: selectError, value: null },
             { selector: selectMenuOpened, value: false },
             { selector: selectHasDevices, value: false },
+            { selector: selectIsAllDevicesOutdated, value: false },
             { selector: selectHasExpiredDevices, value: false },
             { selector: selectHasRiskProfiles, value: false },
             { selector: selectStatus, value: null },
diff --git a/modules/ui/src/app/app.store.spec.ts b/modules/ui/src/app/app.store.spec.ts
index 0d348adee..d5f3f168b 100644
--- a/modules/ui/src/app/app.store.spec.ts
+++ b/modules/ui/src/app/app.store.spec.ts
@@ -26,6 +26,7 @@ import {
   selectHasRiskProfiles,
   selectInterfaces,
   selectInternetConnection,
+  selectIsAllDevicesOutdated,
   selectIsOpenWaitSnackBar,
   selectMenuOpened,
   selectReports,
@@ -104,6 +105,7 @@ describe('AppStore', () => {
             { selector: selectIsOpenWaitSnackBar, value: false },
             { selector: selectTestModules, value: MOCK_TEST_MODULES },
             { selector: selectInternetConnection, value: false },
+            { selector: selectIsAllDevicesOutdated, value: false },
           ],
         }),
         { provide: TestRunService, useValue: mockService },
@@ -165,6 +167,7 @@ describe('AppStore', () => {
           consentShown: false,
           hasDevices: true,
           hasExpiredDevices: true,
+          isAllDevicesOutdated: false,
           hasRiskProfiles: false,
           reports: [],
           isStatusLoaded: false,
diff --git a/modules/ui/src/app/app.store.ts b/modules/ui/src/app/app.store.ts
index 7b00f08b8..06a75d9c9 100644
--- a/modules/ui/src/app/app.store.ts
+++ b/modules/ui/src/app/app.store.ts
@@ -25,6 +25,7 @@ import {
   selectHasRiskProfiles,
   selectInterfaces,
   selectInternetConnection,
+  selectIsAllDevicesOutdated,
   selectMenuOpened,
   selectReports,
   selectStatus,
@@ -68,6 +69,7 @@ export class AppStore extends ComponentStore<AppComponentState> {
   private isStatusLoaded$ = this.select(state => state.isStatusLoaded);
   private hasInternetConnection$ = this.store.select(selectInternetConnection);
   private hasDevices$ = this.store.select(selectHasDevices);
+  private isAllDevicesOutdated$ = this.store.select(selectIsAllDevicesOutdated);
   private hasExpiredDevices$ = this.store.select(selectHasExpiredDevices);
   private hasRiskProfiles$ = this.store.select(selectHasRiskProfiles);
   private reports$ = this.store.select(selectReports);
@@ -84,6 +86,7 @@ export class AppStore extends ComponentStore<AppComponentState> {
   viewModel$ = this.select({
     consentShown: this.consentShown$,
     hasDevices: this.hasDevices$,
+    isAllDevicesOutdated: this.isAllDevicesOutdated$,
     hasExpiredDevices: this.hasExpiredDevices$,
     hasRiskProfiles: this.hasRiskProfiles$,
     reports: this.reports$,
diff --git a/modules/ui/src/styles.scss b/modules/ui/src/styles.scss
index 917b38763..46bc22278 100644
--- a/modules/ui/src/styles.scss
+++ b/modules/ui/src/styles.scss
@@ -319,16 +319,16 @@ body
 }
 
 body
-  #main:has(app-callout .error):has(app-callout .error)
+  #main:has(app-callout .error app-callout .error)
   app-device-repository:not(:has(.device-repository-content-empty)),
 body
-  #main:has(app-callout .error):has(app-callout .error)
+  #main:has(app-callout .error app-callout .error)
   app-history:not(:has(.results-content-empty)),
 body
-  #main:has(app-callout .error):has(app-callout .error)
+  #main:has(app-callout .error app-callout .error)
   app-progress:not(:has(.progress-content-empty)),
 body
-  #main:has(app-callout .error):has(app-callout .error)
+  #main:has(app-callout .error app-callout .error)
   app-risk-assessment
   .risk-assessment-container {
   margin-top: 156px;