diff --git a/TODO b/TODO
index 32c4a06..d30a4b2 100644
--- a/TODO
+++ b/TODO
@@ -2,11 +2,9 @@
 
 - Reactivity on project delete (update dropdown) + test guest
 
-- Devices remove empty (Fix devices Dashboard card, replace empty with "unkwnwn")
 - docs vertical navigation not wfull
 - project creation
 - Event funnel / metadata analyzer / user flow
-- Test guest actions
 - Refactor UI Data analyst
 - Remove Top Events from web analytics and move to custom events (with raw data access)
 - Fix email on plan upgrade and resub
\ No newline at end of file
diff --git a/dashboard/components/BarCard/Devices.vue b/dashboard/components/BarCard/Devices.vue
index 9af29a6..fe304bc 100644
--- a/dashboard/components/BarCard/Devices.vue
+++ b/dashboard/components/BarCard/Devices.vue
@@ -1,22 +1,29 @@
 <script lang="ts" setup>
 
 
+function transform(data: { _id: string, count: number }[]) {
+    console.log(data);
+    return data.map(e => ({ ...e, _id: e._id == null ? 'unknown' : e._id }))
+}
+
 const devicesData = useFetch('/api/data/devices', {
-    headers: useComputedHeaders({ limit: 10, }), lazy: true
+    headers: useComputedHeaders({ limit: 10, }), lazy: true,
+    transform
 });
 
 const { showDialog, dialogBarData, isDataLoading } = useBarCardDialog();
 
 async function showMore() {
-    dialogBarData.value=[];
+    dialogBarData.value = [];
     showDialog.value = true;
     isDataLoading.value = true;
 
     const res = await $fetch('/api/data/devices', {
-        headers: useComputedHeaders({ limit: 1000 }).value
+        headers: useComputedHeaders({ limit: 1000 }).value,
     });
 
-    dialogBarData.value = res || [];
+
+    dialogBarData.value = transform(res || []);
 
     isDataLoading.value = false;