diff --git a/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java b/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
index fb243d1a0bd..c6d3f2d31d3 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
@@ -127,6 +127,9 @@ boolean ignoreWaySegmentCombination(Way w1, Way w2) {
             if (isSubwayOrTramOrRazed(w2)) {
                 return true;
             }
+            if (w1.hasKey(RAILWAY) && w2.hasKey(RAILWAY) && w1.hasTag(RAILWAY, "yard") != w2.hasTag(RAILWAY, "yard")) {
+                return true; // see #20089
+            }
             if (isCoastline(w1) != isCoastline(w2)) {
                 return true;
             }