diff --git a/modules/ui/feature_list.js b/modules/ui/feature_list.js
index d5ed9330b..4fc298731 100644
--- a/modules/ui/feature_list.js
+++ b/modules/ui/feature_list.js
@@ -174,7 +174,9 @@ export function uiFeatureList(context) {
 
             var visible = context.surface().selectAll('.point, .line, .area').nodes();
             for (var i = 0; i < visible.length && result.length <= 200; i++) {
-                addEntity(visible[i].__data__);
+                var datum = visible[i].__data__;
+                var entity = datum && datum.properties && datum.properties.entity;
+                if (entity) { addEntity(entity); }
             }
 
             (_geocodeResults || []).forEach(function(d) {