diff --git a/modules/ui/entity_issues.js b/modules/ui/entity_issues.js
index 7c86fc4e3..d5a5d332c 100644
--- a/modules/ui/entity_issues.js
+++ b/modules/ui/entity_issues.js
@@ -126,7 +126,8 @@ export function uiEntityIssues(context) {
                             var loc = d.loc();
                             if (loc) {
                                 context.map().centerZoomEase(loc, Math.max(context.map().zoom(), 18));
-                            } else if (d.entities && d.entities.length > 0) {
+                            } else if (d.entities && d.entities.length > 0 &&
+                                !d.entities[0].intersects(context.map().extent(), context.graph())) {
                                 context.map().zoomToEase(d.entities[0]);
                             }
                         } else {