diff --git a/js/id/ui/conflicts.js b/js/id/ui/conflicts.js
index 01ef1e76c..8bf1011fa 100644
--- a/js/id/ui/conflicts.js
+++ b/js/id/ui/conflicts.js
@@ -218,7 +218,11 @@ iD.ui.Conflicts = function(context) {
 
         var entity = context.graph().hasEntity(id);
         if (entity) {
-            context.map().trimmedExtent(extent);
+            if (extent) {
+                context.map().trimmedExtent(extent);
+            } else {
+                context.map().zoomTo(entity);
+            }
             context.surface().selectAll(
                 iD.util.entityOrMemberSelector([entity.id], context.graph()))
                 .classed('hover', true);