diff --git a/server/src/lib/unifiController.js b/server/src/lib/unifiController.js
index d8f33e7..7790108 100644
--- a/server/src/lib/unifiController.js
+++ b/server/src/lib/unifiController.js
@@ -207,12 +207,12 @@ export async function getOnlineWifiDevices() {
 
 export async function getAccessPoints() {
   try {
-    const accessPoints = await unifiController.getAccessDevices('default')
+    const [accessPoints] = await unifiController.getAccessDevices('default')
 
-    const restructuredAccessPoints = accessPoints[0].map(
+    const restructuredAccessPoints = accessPoints.map(
       ({ mac, model, ip, uptime, name, num_sta, bytes }) => ({
         mac,
-        hostname: name,
+        hostname: name || mac.replaceAll(':', ''),
         uptime: uptime ? +uptime : -1,
         controller: 'UniFi',
         model,