diff --git a/app/src/main/java/eu/darken/capod/monitor/core/DeviceMonitor.kt b/app/src/main/java/eu/darken/capod/monitor/core/DeviceMonitor.kt
index dcdfee24..d5332740 100644
--- a/app/src/main/java/eu/darken/capod/monitor/core/DeviceMonitor.kt
+++ b/app/src/main/java/eu/darken/capod/monitor/core/DeviceMonitor.kt
@@ -53,9 +53,11 @@ class DeviceMonitor @Inject constructor(
         deviceStateCache.cachedStates,
         profilesRepo.profiles,
     ) { pods, aapStates, cachedStates, profiles ->
+        val profilesById = profiles.associateBy { it.id }
+
         // Live devices — BLE + AAP + cached fallback for missing fields
         val liveDevices = pods.map { pod ->
-            val profile = pod.meta.profile
+            val profile = pod.meta.profile?.id?.let(profilesById::get)
             PodDevice(
                 profileId = profile?.id,
                 label = profile?.label,