Index: src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java
===================================================================
--- src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java	(revision 18126)
+++ src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java	(working copy)
@@ -5,7 +5,6 @@
 
 import javax.swing.text.JTextComponent;
 
-import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
 import org.openstreetmap.josm.spi.preferences.Config;
 
@@ -55,14 +54,7 @@
      * @see ComboBoxHistory#addElement(java.lang.String)
      */
     public void addCurrentItemToHistory() {
-        Object item = getEditor().getItem();
-        if (item instanceof String) {
-            model.addElement((String) item);
-        } else if (item instanceof AutoCompletionItem) {
-            model.addElement((AutoCompletionItem) item);
-        } else {
-            throw new IllegalArgumentException(item.getClass().getSimpleName() + " is not supported in addCurrentItemToHistory");
-        }
+        model.addElement(getEditor().getItem().toString());
     }
 
     /**
Index: test/unit/org/openstreetmap/josm/gui/widgets/HistoryComboBoxTest.java
===================================================================
--- test/unit/org/openstreetmap/josm/gui/widgets/HistoryComboBoxTest.java	(revision 18126)
+++ test/unit/org/openstreetmap/josm/gui/widgets/HistoryComboBoxTest.java	(working copy)
@@ -3,7 +3,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.stream.Stream;
 
@@ -21,7 +20,7 @@
 @FullPreferences
 class HistoryComboBoxTest {
     static Stream<Arguments> testNonRegression21203() {
-        return Stream.of(Arguments.of("Hello world"), Arguments.of(new AutoCompletionItem("Hello world2")));
+        return Stream.of(Arguments.of("Hello world"), Arguments.of(new AutoCompletionItem("Hello world2")), Arguments.of(new Double(42)));
     }
 
     /**
@@ -38,17 +37,11 @@
         assertDoesNotThrow(historyComboBox::addCurrentItemToHistory);
     }
 
-    /**
-     * This ensures that we do throw on unknown objects for #21203
-     */
     @Test
-    void testNonRegression21203Throws() {
+    void testEmptyEditor() {
         final HistoryComboBox historyComboBox = new HistoryComboBox();
-        // Sanity check
-        assertEquals(0, historyComboBox.getModel().getSize());
-        historyComboBox.getEditor().setItem(new Object());
-        IllegalArgumentException illegalArgumentException = assertThrows(IllegalArgumentException.class,
-                historyComboBox::addCurrentItemToHistory);
-        assertEquals("Object is not supported in addCurrentItemToHistory", illegalArgumentException.getMessage());
+        assertDoesNotThrow(historyComboBox::addCurrentItemToHistory);
+        historyComboBox.getEditor().setItem(null);
+        assertDoesNotThrow(historyComboBox::addCurrentItemToHistory);
     }
 }