diff --git a/DynmapCore/src/main/resources/extracted/web/js/custommarker.js b/DynmapCore/src/main/resources/extracted/web/js/custommarker.js
index 654f8ca6..f4790f9a 100644
--- a/DynmapCore/src/main/resources/extracted/web/js/custommarker.js
+++ b/DynmapCore/src/main/resources/extracted/web/js/custommarker.js
@@ -37,6 +37,9 @@ L.CustomMarker = L.Class.extend({
 		
 		map.on('viewreset', this._reset, this);
 		this._reset();
+		if (map.options.zoomAnimation && map.options.markerZoomAnimation) {
+			map.on('zoomanim', this._animateZoom, this);
+		}
 	},
 	
 	onRemove: function(map) {
@@ -60,6 +63,12 @@ L.CustomMarker = L.Class.extend({
 		this._latlng = latlng;
 		this._reset();
 	},
+
+	_animateZoom: function (opt) {
+		var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center);
+		L.DomUtil.setPosition(this._element, pos);
+		this._element.style.zIndex = pos.y;
+	},
 	
 	_reset: function() {
 		if(this._map == null)
@@ -97,6 +106,9 @@ L.CustomMarker = L.Class.extend({
 				this.dragging.enable();
 			}
 		}
+		var animation = (map.options.zoomAnimation && map.options.markerZoomAnimation);
+		if (this._element)
+			this._element.className += animation ? ' leaflet-zoom-animated' : ' leaflet-zoom-hide';
 	},
 	
 	_onMouseClick: function(e) {
@@ -131,4 +143,4 @@ L.CustomMarker = L.Class.extend({
 		return this;
 	}
 	
-});
\ No newline at end of file
+});