diff --git a/modules/core/validator.js b/modules/core/validator.js
index 98f74306d..6fb066533 100644
--- a/modules/core/validator.js
+++ b/modules/core/validator.js
@@ -204,11 +204,11 @@ export function validationIssue(attrs) {
         if (this.coordinates && Array.isArray(this.coordinates) && this.coordinates.length === 2) {
             return this.coordinates;
         }
-        if (this.entities && this.entities.length > 0) {
+        /*if (this.entities && this.entities.length > 0) {
             if (this.entities[0].loc) {
                 return this.entities[0].loc;
             }
-        }
+        }*/
     };
 
     if (this.fixes) {
diff --git a/modules/ui/issues.js b/modules/ui/issues.js
index 7dd2358ca..d6019fb1b 100644
--- a/modules/ui/issues.js
+++ b/modules/ui/issues.js
@@ -140,6 +140,8 @@ export function uiIssues(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) {
+                    context.map().zoomTo(d.entities[0]);
                 }
                 if (d.entities) {
                     context.enter(modeSelect(