diff --git a/addons/main/CfgFunctions.hpp b/addons/main/CfgFunctions.hpp
index 66a51bb..8a5e62d 100644
--- a/addons/main/CfgFunctions.hpp
+++ b/addons/main/CfgFunctions.hpp
@@ -43,6 +43,9 @@ class CfgFunctions {
 			class postDroneMarker {
 				file = "\armatak\armatak\armatak_main\functions\api\fn_postDroneMarker.sqf";
 			};
+			class deleteMarker {
+				file = "\armatak\armatak\armatak_main\functions\api\fn_deleteMarker.sqf";
+			};
 		};
 	};
 };
\ No newline at end of file
diff --git a/addons/main/functions/api/fn_deleteMarker.sqf b/addons/main/functions/api/fn_deleteMarker.sqf
new file mode 100644
index 0000000..f84b0ae
--- /dev/null
+++ b/addons/main/functions/api/fn_deleteMarker.sqf
@@ -0,0 +1,3 @@
+params["_unit"];
+
+"armatak" callExtension ["delete_marker", _unit call armatak_fnc_extract_info];
\ No newline at end of file
diff --git a/addons/main/functions/fn_init.sqf b/addons/main/functions/fn_init.sqf
index cda2a36..2b05b50 100644
--- a/addons/main/functions/fn_init.sqf
+++ b/addons/main/functions/fn_init.sqf
@@ -32,11 +32,22 @@ if (isServer && _activated) exitWith {
 				} forEach playableUnits;
 			}, 1, []] call CBA_fnc_addPerFrameHandler;
 		}, [], 1] call CBA_fnc_waitAndExecute;
+
+		addMissionEventHandler ["MPEnded", {
+			{
+				private _unit = _x;
+				_unit call armatak_fnc_deleteMarker;
+			} forEach playableUnits;
+		}];
 	} else {
 		[{
 			player call armatak_fnc_postMarker;
 			player call armatak_fnc_postDroneMarker;
 		}, 1, []] call CBA_fnc_addPerFrameHandler;
+
+		addMissionEventHandler ["Ended", {
+			player call armatak_fnc_deleteMarker;
+		}];
 	};
 
 	private _warning = format ["<t color='#2B7319'>ARMATAK</t><br/> %1", "Connected"];