diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/data-layer/latest-map-data-layer.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/data-layer/latest-map-data-layer.ts
index 3a537ba8e7..fb79611d71 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/data-layer/latest-map-data-layer.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/data-layer/latest-map-data-layer.ts
@@ -117,6 +117,7 @@ export abstract class TbLatestDataLayerItem<S extends MapDataLayerSettings = Map
   public dragModeUpdated() {
     if (this.dataLayer.isEditMode() && !this.selected) {
       if (this.dataLayer.allowDrag()) {
+        this.disableDrag();
         this.enableDrag();
         this.addItemClass('tb-draggable');
       } else {
@@ -164,6 +165,7 @@ export abstract class TbLatestDataLayerItem<S extends MapDataLayerSettings = Map
       this.addItemClass('tb-hoverable');
     }
     if (this.dataLayer.allowDrag()) {
+      this.disableDrag();
       this.enableDrag();
       this.addItemClass('tb-draggable');
     }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/data-layer/markers-data-layer.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/data-layer/markers-data-layer.ts
index 146ace1120..3696435683 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/data-layer/markers-data-layer.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/data-layer/markers-data-layer.ts
@@ -480,7 +480,7 @@ class TbMarkerDataLayerItem extends TbLatestDataLayerItem<MarkersDataLayerSettin
       });
       this.marker.pm.enableLayerDrag();
       this.marker.on('pm:dragstart', () => {
-        (this.marker.dragging as any)._draggable = { _moved: true };
+        (this.marker.dragging as any)._draggable = { _moved: true, off: (_args: any) => { return { disable: () => {}} } };
         (this.marker.dragging as any)._enabled = true;
         this.moving = true;
       });