diff --git a/src/scripts/site.js b/src/scripts/site.js
index 6a582d7ebe..2ff4a04c91 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -26,7 +26,7 @@ import './libraryMenu';
 import './routes';
 import '../components/themeMediaPlayer';
 import './autoBackdrops';
-import { navigate, pageClassOn, serverAddress } from './clientUtils';
+import { pageClassOn, serverAddress } from './clientUtils';
 import '../libraries/screensavermanager';
 import './serverNotifications';
 import '../components/playback/playerSelectionMenu';
@@ -77,12 +77,9 @@ function loadCoreDictionary() {
 
 function init() {
     serverAddress().then(server => {
-        if (!server) {
-            navigate('selectserver.html');
-            return;
+        if (server) {
+            ServerConnections.initApiClient(server);
         }
-
-        ServerConnections.initApiClient(server);
     }).then(() => {
         console.debug('initAfterDependencies promises resolved');
 
diff --git a/src/scripts/standalone.js b/src/scripts/standalone.js
deleted file mode 100644
index 4a455fe9da..0000000000
--- a/src/scripts/standalone.js
+++ /dev/null
@@ -1,3 +0,0 @@
-window.appMode = 'standalone';
-
-import('./site');
diff --git a/webpack.dev.js b/webpack.dev.js
index 0f3a02925c..046a1edd73 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -4,7 +4,7 @@ const merge = require('webpack-merge');
 
 module.exports = merge(common, {
     mode: 'development',
-    entry: './scripts/standalone.js',
+    entry: './scripts/site.js',
     devtool: 'source-map',
     module: {
         rules: [