1 files changed, 4 insertions, 1 deletions
diff --git a/modern/src/main/DevicesList.js b/modern/src/main/DevicesList.js
index cea5b253..054cf509 100644
--- a/modern/src/main/DevicesList.js
+++ b/modern/src/main/DevicesList.js
@@ -82,7 +82,10 @@ const DeviceRow = ({ data, index, style }) => {
   const formatProperty = (key) => {
     if (key === 'geofenceIds') {
       const geofenceIds = item[key] || [];
-      return geofenceIds.map((id) => geofences[id].name).join(', ');
+      return geofenceIds
+        .filter((id) => geofences.hasOwnProperty(id))
+        .map((id) => geofences[id].name)
+        .join(', ');
     }
     return item[key];
   };