diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx
index b187e27d24..d1d5e85451 100755
--- a/src/renderer/components/app.tsx
+++ b/src/renderer/components/app.tsx
@@ -56,9 +56,8 @@ export class App extends React.Component {
 
     disposeOnUnmount(this, [
       reaction(() => this.startURL, url => {
-        if (!this.clusterReady) {
-          navigation.replace(url);
-        }
+        const redirect = !this.clusterReady || !clusterStore.hasClusters();
+        if (redirect) navigation.replace(url);
       }, {
         fireImmediately: true
       })
diff --git a/webpack.renderer.ts b/webpack.renderer.ts
index 73c6a29ac4..36c0546e83 100755
--- a/webpack.renderer.ts
+++ b/webpack.renderer.ts
@@ -18,6 +18,7 @@ export default function (): webpack.Configuration {
       [appName]: path.resolve(rendererDir, "index.tsx"),
     },
     output: {
+      publicPath: "/",
       path: outDir,
       filename: '[name].js',
       chunkFilename: 'chunks/[name].js',