diff --git a/web/src/components/dataTables/UserWifiDevicesDataTable.vue b/web/src/components/dataTables/UserWifiDevicesDataTable.vue
index 02a2518..9d50ce7 100644
--- a/web/src/components/dataTables/UserWifiDevicesDataTable.vue
+++ b/web/src/components/dataTables/UserWifiDevicesDataTable.vue
@@ -56,8 +56,9 @@
             params: { id: item.accessPoint.id }
           }"
         >
-          {{ item.accessPoint.name || item.apName }}
+          {{ item.accessPoint.name || item.accessPoint.hostname }}
         </router-link>
+        <span v-else>{{ item.apName }}</span>
       </template>
       <template #[`item.local`]="{ item }">
         <small v-if="item.accessPoint && item.accessPoint.local">
diff --git a/web/src/components/dataTables/WifiDevicesDataTable.vue b/web/src/components/dataTables/WifiDevicesDataTable.vue
index 4855e25..f9cc4ec 100644
--- a/web/src/components/dataTables/WifiDevicesDataTable.vue
+++ b/web/src/components/dataTables/WifiDevicesDataTable.vue
@@ -66,6 +66,7 @@
             {{ item.accessPoint.name || item.accessPoint.hostname }}
           </small>
         </router-link>
+        <span v-else>{{ item.apName }}</span>
       </template>
 
       <template #[`item.lastSeen`]="{ item: { lastSeen } }">