diff --git a/modules/core/context.js b/modules/core/context.js
index fc9a76e4d..8e6fdd655 100644
--- a/modules/core/context.js
+++ b/modules/core/context.js
@@ -196,7 +196,9 @@ export function coreContext() {
     const throttledZoomTo = _throttle(() => _map.zoomTo(loadedEntities), 500);
     entityIDs.forEach(entityID => context.loadEntity(entityID, (err, result) => {
       if (err) return;
-      loadedEntities.push(result.data.find(e => e.id === entityID));
+      const entity = result.data.find(e => e.id === entityID);
+      if (!entity) return;
+      loadedEntities.push(entity);
       if (zoomTo !== false) {
         throttledZoomTo();
       }