diff --git a/maps.py b/maps.py
index ec951173c..45f0188d3 100644
--- a/maps.py
+++ b/maps.py
@@ -750,6 +750,10 @@ def geocoords_from_map_link(url: str, osm_domain: str,
         zoom, latitude, longitude = \
             _geocoords_from_osmorg_link(url)
         return zoom, latitude, longitude
+    if 'osm.org' in url:
+        zoom, latitude, longitude = \
+            _geocoords_from_osm_link(url, 'osm.org')
+        return zoom, latitude, longitude
     if 'osmand.net' in url and '/map' in url:
         zoom, latitude, longitude = \
             _geocoords_from_osmand_link(url)
diff --git a/tests.py b/tests.py
index 7eb21c7cf..a5a26fb27 100644
--- a/tests.py
+++ b/tests.py
@@ -8305,6 +8305,14 @@ def _test_hashtag_maps():
     assert longitude
     assert int(longitude * 1000) == -3599
     assert len(map_links) == 3
+    link = "https://www.osm.org/#map=17/34.693740/135.502180"
+    zoom, latitude, longitude = \
+        geocoords_from_map_link(link, 'openstreetmap.org', session)
+    assert zoom == 17
+    assert latitude
+    assert int(latitude * 1000) == 34693
+    assert longitude
+    assert int(longitude * 1000) == 135502
 
 
 def _test_uninvert():