diff --git a/src/components/dialogs/DialogAddRemove.vue b/src/components/dialogs/DialogAddRemove.vue
index 0f4730f77e8..43ac7416de5 100644
--- a/src/components/dialogs/DialogAddRemove.vue
+++ b/src/components/dialogs/DialogAddRemove.vue
@@ -146,7 +146,7 @@ export default {
       }, 100)
     },
     controllerStatus (status) {
-      if (status.indexOf('clusion') > 0) {
+      if (status && status.indexOf('clusion') > 0) {
         if (this.state === 'new') return // ignore initial status
 
         // inclusion/exclusion started, start the countdown timer
diff --git a/src/router/index.js b/src/router/index.js
index dd6a4be3393..0d435f3a230 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -25,7 +25,7 @@ export const Routes = {
   mesh: '/mesh'
 }
 
-Routes.main = Routes.settings
+Routes.main = Routes.controlPanel
 
 const router = new Router({
   mode: 'history',