diff --git a/modules/ui/src/app/app.component.ts b/modules/ui/src/app/app.component.ts
index 4b75aa5b4..c8b6d8a0b 100644
--- a/modules/ui/src/app/app.component.ts
+++ b/modules/ui/src/app/app.component.ts
@@ -114,19 +114,11 @@ export class AppComponent implements OnInit {
 
   ngOnInit(): void {
     this.systemStatus$ = this.testRunService.systemStatus$.pipe(
-      tap(() => (this.isStatusLoaded = true))
+      tap(() => (this.isStatusLoaded = true)),
+      shareReplay({ refCount: true, bufferSize: 1 })
     );
 
     this.isTestrunStarted$ = this.testRunService.isTestrunStarted$;
-
-    this.hasConnectionSetting$.pipe(
-      tap(result => {
-        if (result !== null) {
-          this.isConnectionSettingsLoaded = true;
-        }
-      }),
-      shareReplay({ refCount: true, bufferSize: 1 })
-    );
   }
 
   navigateToDeviceRepository(): void {
diff --git a/modules/ui/src/app/pages/devices/device-repository.component.html b/modules/ui/src/app/pages/devices/device-repository.component.html
index 8979bc3b7..efd61fc2e 100644
--- a/modules/ui/src/app/pages/devices/device-repository.component.html
+++ b/modules/ui/src/app/pages/devices/device-repository.component.html
@@ -16,7 +16,7 @@
 <ng-container *ngIf="viewModel$ | async as vm">
   <ng-container *ngIf="vm.devices.length > 0; else empty">
     <mat-toolbar class="device-repository-toolbar">
-      <h2 class="title">Devices {{ vm.selectedDevice === null }}</h2>
+      <h2 class="title">Devices</h2>
       <ng-container *ngTemplateOutlet="addDeviceButton"></ng-container>
     </mat-toolbar>
     <div class="device-repository-content">
diff --git a/modules/ui/src/app/store/state.ts b/modules/ui/src/app/store/state.ts
index 76fe5132d..e8b98ad6a 100644
--- a/modules/ui/src/app/store/state.ts
+++ b/modules/ui/src/app/store/state.ts
@@ -43,7 +43,7 @@ export interface SharedState {
   //app, testrun
   isTestrunStarted?: boolean;
   //app, settings
-  hasConnectionSettings: boolean;
+  hasConnectionSettings: boolean | null;
   // app, devices
   isOpenAddDevice: boolean;
 }
@@ -58,7 +58,7 @@ export const initialAppComponentState: AppComponentState = {
 };
 
 export const initialSharedState: SharedState = {
-  hasConnectionSettings: false,
+  hasConnectionSettings: null,
   isOpenAddDevice: false,
   hasDevices: false,
   devices: [],