diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
index e355546..bf31db1 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
@@ -634,7 +634,6 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
 
             combo = new JComboBox(lhm.values().toArray());
             component = combo;
-            combo.setRenderer(getListCellRenderer());
             combo.setEditable(editable);
             combo.setMaximumRowCount(13);
             AutoCompletingTextField tf = new AutoCompletingTextField();
@@ -646,7 +645,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
                 // all items have the same value (and there were no unset items)
                 originalValue = lhm.get(usage.getFirst());
                 combo.setSelectedItem(originalValue);
-            } else if (def != null && usage.unused()) {
+            } else if (def != null && !def.isEmpty() && usage.unused()) {
                 // default is set and all items were unset
                 if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
                     // selected osm primitives are untagged or filling default feature is enabled