diff --git a/GatewayApp/Frontend/Plantmonitor.Website/src/features/deviceConfiguration/+page.svelte b/GatewayApp/Frontend/Plantmonitor.Website/src/features/deviceConfiguration/+page.svelte
index dcfbd6c3..249b46a1 100644
--- a/GatewayApp/Frontend/Plantmonitor.Website/src/features/deviceConfiguration/+page.svelte
+++ b/GatewayApp/Frontend/Plantmonitor.Website/src/features/deviceConfiguration/+page.svelte
@@ -144,14 +144,14 @@
         const outletClient = new PowerOutletClient();
         try {
             devices = await client.getDevices();
-            devices
-                .filter((d) => d.health.deviceId != undefined)
-                .forEach(async (element) => {
-                    const deviceId = element.health.deviceId!;
-                    var outlet = await outletClient.powerOutletForDevice(deviceId);
-                    outletByDevice[deviceId] = outlet;
-                });
+            const outletDevices = devices.filter((d) => d.health?.deviceId != undefined);
+            for (let i = 0; i < outletDevices.length; i++) {
+                const deviceId = outletDevices[i].health.deviceId!;
+                var outlet = await outletClient.powerOutletForDevice(deviceId);
+                outletByDevice[deviceId] = outlet;
+            }
         } catch (ex) {
+            console.log(ex);
             devices = [];
         }
     }
@@ -232,10 +232,10 @@
                                             items={existingOutlets}></Select>
                                     </div>
                                 {/if}
+                                <button class="btn btn-primary" on:click={async () => await checkStatus(device.ip)}
+                                    >Check Device</button>
                             {/if}
                             <button on:click={() => openConsole(device.ip)} class="btn btn-primary"> Open Console </button>
-                            <button class="btn btn-primary" on:click={async () => await checkStatus(device.ip)}
-                                >Check Device</button>
                         </td>
                     </tr>
                 </tbody>
diff --git a/GatewayApp/Frontend/Plantmonitor.Website/src/features/reuseableComponents/DeviceSelection.svelte b/GatewayApp/Frontend/Plantmonitor.Website/src/features/reuseableComponents/DeviceSelection.svelte
index bf8a8327..af4e8e40 100644
--- a/GatewayApp/Frontend/Plantmonitor.Website/src/features/reuseableComponents/DeviceSelection.svelte
+++ b/GatewayApp/Frontend/Plantmonitor.Website/src/features/reuseableComponents/DeviceSelection.svelte
@@ -32,7 +32,7 @@
         <button
             on:click={() => deviceSelected(device)}
             class="p-0 m-0 ms-3 alert {(selectedDevice?.ip == device.ip ? 'selected' : '') + ` available-${device.retryTimes}`}">
-            {device.health?.deviceName}<br />
+            {device.health?.deviceName ?? "not configured"}<br />
             {device.ip}
         </button>
     {/each}