diff --git a/ReallifeGamemode.Client/Interaction/factioninteraction.ts b/ReallifeGamemode.Client/Interaction/factioninteraction.ts
index 87892495..27c56ed3 100644
--- a/ReallifeGamemode.Client/Interaction/factioninteraction.ts
+++ b/ReallifeGamemode.Client/Interaction/factioninteraction.ts
@@ -216,6 +216,7 @@ export default function factionInteraction(globalData: IGlobalData) {
         let reviveTaskMenuMedic;
         let healTaskMenuMedic;
         let fireTaskMenuMedic;
+        let deleteCheckpointItem;
 
         if (userFactionId == 2) {
             if (isDuty) {
@@ -231,6 +232,10 @@ export default function factionInteraction(globalData: IGlobalData) {
                 fireTaskMenuMedic.SetRightLabel(fPM + fireTaskCountMedic);
                 factionInteractionMenu.AddItem(fireTaskMenuMedic);
                 */
+                if (activeTask.Type == 1 && activeCheckpoint && mp.checkpoints.exists(activeCheckpoint)) {
+                    deleteCheckpointItem = new UIMenuItem("~r~Checkpoint löschen");
+
+                }
             }
         }
 
@@ -260,6 +265,12 @@ export default function factionInteraction(globalData: IGlobalData) {
                     mp.gui.chat.activate(true);
                     globalData.InMenu = false;
                     break;
+                case deleteCheckpointItem:
+                    factionInteractionMenu.Close();
+                    mp.gui.chat.activate(true);
+                    globalData.InMenu = false;
+                    break;
+
             }
         });
 
diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs
index 264812cd..6d3c6eb8 100644
--- a/ReallifeGamemode.Server/Events/Disconnect.cs
+++ b/ReallifeGamemode.Server/Events/Disconnect.cs
@@ -144,8 +144,13 @@ namespace ReallifeGamemode.Server.Events
       player.SetData("isLoggedIn", false);
       player.TriggerEvent("CLIENT:DestroyPed", 1);
       player.TriggerEvent("CLIENT:DestroyPed", 2);
-      player.TriggerEvent("CLIENT:DestroyPed", 3);
+      player.TriggerEvent("CLIENT:DestroyPed", 3);    
       player.TriggerEvent("CLIENT:DestroyPed", 4);
+
+      MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
+      Player medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);
+      medicPlayer.TriggerEvent("destroyMedicTaskCheckpoint");
+
       Medic.delHealTask(player);
       Medic.delReviveTask(player);
       if (player.GetData<bool>("duty") == true)