diff --git a/app/javascript/controllers/non_geo_controller.js b/app/javascript/controllers/non_geo_controller.js
index 419e3c6a..965c561e 100644
--- a/app/javascript/controllers/non_geo_controller.js
+++ b/app/javascript/controllers/non_geo_controller.js
@@ -55,10 +55,6 @@ export default class extends Controller {
     return [this.lat, this.lng]
   }
 
-  get svgOverlay () {
-    return this.overlayTarget.querySelector('svg');
-  }
-
   get bounds () {
     return [
       [0, 0],
@@ -72,17 +68,15 @@ export default class extends Controller {
   get map () {
     if (!this._map) {
       this._map = L.map(this.mapTarget, {
-        minZoom: -5,
-        crs: L.CRS.Simple,
-        zoomSnap: 0.1
-      }).setView(this.coords, 13);
+        minZoom: 0,
+        maxZoom: 5
+      }).setView(this.coords, 0);
 
-      const bounds = this.bounds;
-
-      L.svgOverlay(this.svgOverlay, bounds).addTo(this._map);
-
-      this._map.fitBounds(bounds);
-      this._map.setMaxBounds(bounds);
+      this._layer = L.tileLayer(`${this.element.dataset.site}public/map/{z}/{y}/{x}.png`, {
+        minNativeZoom: 0,
+        maxNativeZoom: 5,
+        noWrap: true
+      }).addTo(this._map);
     }
 
     return this._map
diff --git a/app/views/posts/attributes/_non_geo.haml b/app/views/posts/attributes/_non_geo.haml
index 84b1cb00..fd4e85ea 100644
--- a/app/views/posts/attributes/_non_geo.haml
+++ b/app/views/posts/attributes/_non_geo.haml
@@ -1,4 +1,4 @@
-.row{ data: { controller: 'non-geo', map: url_for(site.static_files.blobs.find_by_filename('map.svg').attachments.first)  } }
+.row{ data: { controller: 'non-geo', site: site.url } }
   .d-none{ hidden: true, data: { target: 'non-geo.overlay' }}
   .col
     .form-group