diff --git a/js/id/ui/tageditor.js b/js/id/ui/tageditor.js
index f96e301b5..9afe83a6c 100644
--- a/js/id/ui/tageditor.js
+++ b/js/id/ui/tageditor.js
@@ -16,7 +16,8 @@ iD.ui.TagEditor = function() {
         entity = selection.datum();
 
         if (preset) {
-            tags = _.extend(_.omit(tags, _.keys(presetMatch.match.tags)), preset.match.tags);
+            if (presetMatch) tags = _.omit(tags, _.keys(presetMatch.match.tags));
+            tags = _.extend(_.omit(tags), preset.match.tags);
         }
 
         presetMatch = preset || presetMatch || presetData.matchTags(entity);