Index: /trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java	(revision 17501)
+++ /trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java	(revision 17502)
@@ -19,5 +19,4 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -57,5 +56,5 @@
     private final Map<String, String> headers = new ConcurrentHashMap<>();
     private final String date;
-    private final boolean switchLatLon;
+    private final boolean belowWMS130;
 
     /**
@@ -88,12 +87,5 @@
         // [1] https://www.epsg-registry.org/report.htm?type=selection&entity=urn:ogc:def:crs:EPSG::4326&reportDetail=short&style=urn:uuid:report-style:default-with-code&style_name=OGP%20Default%20With%20Code&title=EPSG:4326
         // CHECKSTYLE.ON: LineLength
-        if (baseUrl.toLowerCase(Locale.US).contains("crs=epsg:4326")) {
-            switchLatLon = true;
-        } else if (baseUrl.toLowerCase(Locale.US).contains("crs=")) {
-            // assume WMS 1.3.0
-            switchLatLon = ProjectionRegistry.getProjection().switchXY();
-        } else {
-            switchLatLon = false;
-        }
+        belowWMS130 = !baseUrl.toLowerCase(Locale.US).contains("crs=");
     }
 
@@ -133,5 +125,5 @@
                 break;
             case "bbox":
-                replacement = getBbox(zoom, tilex, tiley, switchLatLon);
+                replacement = getBbox(zoom, tilex, tiley, !belowWMS130 && getTileProjection().switchXY());
                 break;
             case "w":