diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs
index a2279adc..ca45a809 100644
--- a/ReallifeGamemode.Server/Events/Death.cs
+++ b/ReallifeGamemode.Server/Events/Death.cs
@@ -231,6 +231,8 @@ namespace ReallifeGamemode.Server.Events
         dbContext.SaveChanges();
       }
       player.RemoveAllWeapons();
+      MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
+      Medic.RemoveTaskFromList(task);
       NAPI.Player.SpawnPlayer(player, new Vector3(-495.45, -336.33, 34.5), -98.36f);
 
     }
diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs
index b281887e..a26129b6 100644
--- a/ReallifeGamemode.Server/Events/Disconnect.cs
+++ b/ReallifeGamemode.Server/Events/Disconnect.cs
@@ -14,6 +14,7 @@ using ReallifeGamemode.Services;
 using ReallifeGamemode.Server.Services;
 using ReallifeGamemode.Server.Types;
 using ReallifeGamemode.Server.Report;
+using ReallifeGamemode.Server.Factions.Medic;
 
 /**
 * @overview Life of German Reallife - Event Login (Login.cs)
@@ -136,6 +137,8 @@ namespace ReallifeGamemode.Server.Events
       player.TriggerEvent("CLIENT:DestroyPed", 2);
       player.TriggerEvent("CLIENT:DestroyPed", 3);
       player.TriggerEvent("CLIENT:DestroyPed", 4);
+      MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
+      Medic.RemoveTaskFromList(task);
     }
   }
 }