diff --git a/packages/uhk-web/src/app/store/effects/device.ts b/packages/uhk-web/src/app/store/effects/device.ts
index 933b444ae9e..95d9faa21f2 100644
--- a/packages/uhk-web/src/app/store/effects/device.ts
+++ b/packages/uhk-web/src/app/store/effects/device.ts
@@ -226,7 +226,7 @@ export class DeviceEffects {
                     return this.router.navigate(['/update-firmware']);
 
                 if (state.userConfiguration.userConfiguration.hostConnections.length > HOST_CONNECTION_COUNT_MAX) {
-                    return;
+                    return this.router.navigate(['/host-connections']);
                 }
 
                 setTimeout(() => this.sendUserConfigToKeyboard(
diff --git a/packages/uhk-web/src/app/store/reducers/user-configuration.ts b/packages/uhk-web/src/app/store/reducers/user-configuration.ts
index 904e60cdc47..d2cb6b7ede3 100644
--- a/packages/uhk-web/src/app/store/reducers/user-configuration.ts
+++ b/packages/uhk-web/src/app/store/reducers/user-configuration.ts
@@ -133,6 +133,10 @@ export function reducer(
                 userConfiguration.hostConnections.push(hostConnection);
             }
 
+            for (let i = userConfiguration.hostConnections.length; i < HOST_CONNECTION_COUNT_MAX; i++) {
+                userConfiguration.hostConnections.push(emptyHostConnection());
+            }
+
             return {
                 ...state,
                 userConfiguration,
@@ -252,6 +256,7 @@ export function reducer(
             return {
                 ...state,
                 newPairedDevicesAdding: false,
+                newPairedDevices: [],
             };
         }