diff --git a/packages/builder/src/pages/portal/settings/general.svelte b/packages/builder/src/pages/portal/settings/general.svelte
index 77da761962..6793d1852d 100644
--- a/packages/builder/src/pages/portal/settings/general.svelte
+++ b/packages/builder/src/pages/portal/settings/general.svelte
@@ -25,11 +25,12 @@
 
   let loading = false
 
-  let company = $organisation?.company
-  let logoUrl = $organisation.logoUrl
+  $: company = $organisation?.company
+  $: logoUrl = $organisation.logoUrl
 
   async function saveConfig() {
     loading = true
+    await toggleAnalytics()
     const res = await organisation.save({ ...$organisation, company })
     if (res.status === 200) {
       notifications.success("General settings saved.")
@@ -78,11 +79,7 @@
       <div class="fields">
         <div class="field">
           <Label>Send Analytics to Budibase</Label>
-          <Toggle
-            text=""
-            bind:value={analyticsDisabled}
-            on:change={toggleAnalytics}
-          />
+          <Toggle text="" value={!analyticsDisabled} />
         </div>
       </div>
     </div>
diff --git a/packages/server/src/api/index.js b/packages/server/src/api/index.js
index f2537d8047..d6719f4734 100644
--- a/packages/server/src/api/index.js
+++ b/packages/server/src/api/index.js
@@ -74,6 +74,4 @@ for (let route of mainRoutes) {
 router.use(staticRoutes.routes())
 router.use(staticRoutes.allowedMethods())
 
-router.redirect("/", "/builder")
-
 module.exports = router