diff --git a/server/src/lib/wifiDevices.js b/server/src/lib/wifiDevices.js
index 09e430b..1506400 100644
--- a/server/src/lib/wifiDevices.js
+++ b/server/src/lib/wifiDevices.js
@@ -102,7 +102,12 @@ async function updateDB(onlineDevices) {
           ...device,
           hostname,
           firstSeen: device.firstSeen || new Date(),
-          user
+          user,
+          accessPoint: {
+            connect: {
+              hostname: device.apName
+            }
+          }
         },
         update: {
           ...device,
diff --git a/web/src/components/dataTables/WifiDevicesDataTable.vue b/web/src/components/dataTables/WifiDevicesDataTable.vue
index 78a46fe..4855e25 100644
--- a/web/src/components/dataTables/WifiDevicesDataTable.vue
+++ b/web/src/components/dataTables/WifiDevicesDataTable.vue
@@ -55,7 +55,7 @@
       </template>
       <template #[`item.apName`]="{ item }">
         <router-link
-          v-if="item.accessPoint"
+          v-if="item.accessPoint && item.accessPoint.id"
           class="text-decoration-none"
           :to="{
             name: 'access-point-clients',