diff --git a/package.json b/package.json
index 35661a29..11296bf8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/ember-ui",
-    "version": "0.3.1",
+    "version": "0.3.2",
     "description": "Fleetbase UI provides all the interface components, helpers, services and utilities for building a Fleetbase extension into the Console.",
     "keywords": [
         "fleetbase-ui",
@@ -186,7 +186,8 @@
     },
     "pnpm": {
         "patchedDependencies": {
-            "ember-gridstack@4.0.0": "patches/ember-gridstack@4.0.0.patch"
+            "ember-gridstack@4.0.0": "patches/ember-gridstack@4.0.0.patch",
+            "ember-leaflet": "patches/ember-leaflet.patch"
         }
     }
 }
diff --git a/patches/ember-leaflet.patch b/patches/ember-leaflet.patch
new file mode 100644
index 00000000..f865a0b2
--- /dev/null
+++ b/patches/ember-leaflet.patch
@@ -0,0 +1,45 @@
+diff --git a/addon/components/marker-layer.js b/addon/components/marker-layer.js
+index 132bc4876f0c2847e732fd66e79b06dedf0ea470..ae87f033f1b12301a9a892ced7e408659d76d672 100644
+--- a/addon/components/marker-layer.js
++++ b/addon/components/marker-layer.js
+@@ -264,13 +264,15 @@ export default class MarkerLayer extends InteractiveLayer {
+       arg: 'icon',
+       // there was an old leaflet bug where draggability is lost on icon change
+       updateFn(layer, value) {
+-        let enabled = layer.dragging.enabled();
+         layer.setIcon(value);
+-
+-        if (enabled) {
+-          layer.dragging.enable();
+-        } else {
+-          layer.dragging.disable();
++        
++        if (layer.dragging) {
++          let enabled = layer.dragging.enabled();
++          if (enabled) {
++            layer.dragging.enable();
++          } else {
++            layer.dragging.disable();
++          }
+         }
+       }
+     }
+diff --git a/addon/components/popup-layer.js b/addon/components/popup-layer.js
+index 960ca419a96bed894a420c629f43501265adc4dd..122a3cd9f0e0ac6e17595514513ee097ebff38c2 100644
+--- a/addon/components/popup-layer.js
++++ b/addon/components/popup-layer.js
+@@ -134,7 +134,13 @@ export default class PopupLayer extends DivOverlayLayer {
+    */
+   @action
+   closePopup() {
+-    this._layer._close ? this._layer._close() : this._layer.close();
++    if (this._layer) {
++      if (typeof this._layer._close === 'function') {
++        this._layer._close()
++      } else if (typeof this._layer.close === 'function') {
++        this._layer.close()
++      }
++    }
+   }
+ 
+   @action
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7a415b04..8e8b40a8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,6 +8,9 @@ patchedDependencies:
   ember-gridstack@4.0.0:
     hash: 7645d189e07b959521021078148e949087a85750095e8b5801d642c1eb63394f
     path: patches/ember-gridstack@4.0.0.patch
+  ember-leaflet:
+    hash: 9958892bb4a9f3c545aaa0c48ce63b548b93230e2deac4f62b46524734368e6d
+    path: patches/ember-leaflet.patch
 
 importers:
 
@@ -180,7 +183,7 @@ importers:
         version: 4.0.3(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))
       ember-leaflet:
         specifier: ^5.1.3
-        version: 5.1.3(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(leaflet@1.9.4)(webpack@5.95.0)
+        version: 5.1.3(patch_hash=9958892bb4a9f3c545aaa0c48ce63b548b93230e2deac4f62b46524734368e6d)(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(leaflet@1.9.4)(webpack@5.95.0)
       ember-loading:
         specifier: ^2.0.0
         version: 2.0.0(@babel/core@7.25.2)
@@ -13064,7 +13067,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  ember-leaflet@5.1.3(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(leaflet@1.9.4)(webpack@5.95.0):
+  ember-leaflet@5.1.3(patch_hash=9958892bb4a9f3c545aaa0c48ce63b548b93230e2deac4f62b46524734368e6d)(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(leaflet@1.9.4)(webpack@5.95.0):
     dependencies:
       '@glimmer/component': 1.1.2(@babel/core@7.25.2)
       '@glimmer/tracking': 1.1.2