diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb
index 03823e25c..59711fce4 100644
--- a/app/helpers/map_locations_helper.rb
+++ b/app/helpers/map_locations_helper.rb
@@ -64,7 +64,7 @@ module MapLocationsHelper
       map_center_longitude: map_location_longitude(map_location),
       map_zoom: map_location_zoom(map_location),
       map_tiles_attribution_selector: map_location_attribution_id(map_location),
-      map_tiles_provider: "//{s}.tile.osm.org/{z}/{x}/{y}.png",
+      map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
       marker_editable: editable,
       marker_latitude: map_location.latitude,
       marker_longitude: map_location.longitude,
diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb
index 1f74698f1..56ca958a9 100644
--- a/app/views/admin/settings/_map_form.html.erb
+++ b/app/views/admin/settings/_map_form.html.erb
@@ -6,7 +6,7 @@
                         data-map-center-longitude="<%= Setting["map_longitude"] %>"
                         data-map-zoom="<%= Setting["map_zoom"] %>"
                         data-map-tiles-attribution-selector="#admin-map-attribution"
-                        data-map-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png"
+                        data-map-tiles-provider="//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
                         data-marker-editable="true"
                         data-marker-latitude="<%= Setting["map_latitude"] %>"
                         data-marker-longitude="<%= Setting["map_longitude"] %>"