diff --git a/src/main/window-manager.ts b/src/main/window-manager.ts
index 184c73ff31..71b12c217e 100644
--- a/src/main/window-manager.ts
+++ b/src/main/window-manager.ts
@@ -36,7 +36,7 @@ export class WindowManager {
         fireImmediately: true
       }),
 
-      // auto-show active cluster window and subscribe for push-events
+      // auto-show active cluster window
       reaction(() => clusterStore.activeClusterId, this.activateView, {
         fireImmediately: true,
       }),
diff --git a/src/renderer/api/rbac.ts b/src/renderer/api/rbac.ts
index 269132bd6d..0490d24d1b 100644
--- a/src/renderer/api/rbac.ts
+++ b/src/renderer/api/rbac.ts
@@ -6,7 +6,7 @@ export function isAllowedResource(resources: string | string[]) {
   if (!Array.isArray(resources)) {
     resources = [resources];
   }
-  const { allowedResources } = getHostedCluster();
+  const { allowedResources = [] } = getHostedCluster() || {};
   for (const resource of resources) {
     if (!allowedResources.includes(resource)) {
       return false;
diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx
index 8a291237d0..c9a1f2c1ce 100755
--- a/src/renderer/components/app.tsx
+++ b/src/renderer/components/app.tsx
@@ -92,23 +92,19 @@ export class App extends React.Component {
           <Route component={Preferences} {...preferencesRoute}/>
           <Route component={Workspaces} {...workspacesRoute}/>
           <Route component={AddCluster} {...addClusterRoute}/>
-          {this.cluster && (
-            <>
-              <Route component={Cluster} {...clusterRoute}/>
-              <Route component={ClusterStatus} {...clusterStatusRoute}/>
-              <Route component={ClusterSettings} {...clusterSettingsRoute}/>
-              <Route component={Nodes} {...nodesRoute}/>
-              <Route component={Workloads} {...workloadsRoute}/>
-              <Route component={Config} {...configRoute}/>
-              <Route component={Network} {...networkRoute}/>
-              <Route component={Storage} {...storageRoute}/>
-              <Route component={Namespaces} {...namespacesRoute}/>
-              <Route component={Events} {...eventRoute}/>
-              <Route component={CustomResources} {...crdRoute}/>
-              <Route component={UserManagement} {...usersManagementRoute}/>
-              <Route component={Apps} {...appsRoute}/>
-            </>
-          )}
+          <Route component={Cluster} {...clusterRoute}/>
+          <Route component={ClusterStatus} {...clusterStatusRoute}/>
+          <Route component={ClusterSettings} {...clusterSettingsRoute}/>
+          <Route component={Nodes} {...nodesRoute}/>
+          <Route component={Workloads} {...workloadsRoute}/>
+          <Route component={Config} {...configRoute}/>
+          <Route component={Network} {...networkRoute}/>
+          <Route component={Storage} {...storageRoute}/>
+          <Route component={Namespaces} {...namespacesRoute}/>
+          <Route component={Events} {...eventRoute}/>
+          <Route component={CustomResources} {...crdRoute}/>
+          <Route component={UserManagement} {...usersManagementRoute}/>
+          <Route component={Apps} {...appsRoute}/>
           <Redirect exact from="/" to={this.startURL}/>
           <Route component={NotFound}/>
         </Switch>