Index: trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java	(revision 13197)
+++ trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java	(revision 13198)
@@ -16,4 +16,5 @@
 import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
 import org.openstreetmap.josm.gui.tagging.TagModel;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -154,5 +155,5 @@
                 if (!oldValue.equals(newValue)) {
                     setProperty(key, newValue);
-                    if (hashtagsKey != null) {
+                    if (hashtagsKey != null && Config.getPref().getBoolean("upload.changeset.hashtags", true)) {
                         String newHashTags = String.join(";", model.findHashTags());
                         String oldHashTags = Optional.ofNullable(getTagEditorValue(hashtagsKey)).orElse("");