diff --git a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
index 933933da39..7293483783 100644
--- a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
@@ -44,6 +44,7 @@ import org.openstreetmap.josm.tools.ImageProcessor;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * Abstract base class for background imagery layers ({@link WMSLayer}, {@link TMSLayer}, {@link WMTSLayer}).
@@ -360,6 +361,11 @@ public abstract class ImageryLayer extends Layer {
 
     @Override
     public String getChangesetSourceTag() {
-        return getInfo().getSourceName();
+        final ImageryInfo currentInfo = getInfo();
+        // ImageryInfo does not use zoom, topLeft, or botRight parameters as of JOSM r18368
+        if (!Utils.isBlank(currentInfo.getAttributionText(0, null, null))) {
+            return currentInfo.getAttributionText(0, null, null);
+        }
+        return currentInfo.getSourceName();
     }
 }