diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs
index f7522093..ba6e0506 100644
--- a/ReallifeGamemode.Server/Events/Death.cs
+++ b/ReallifeGamemode.Server/Events/Death.cs
@@ -93,11 +93,9 @@ namespace ReallifeGamemode.Server.Events
 
       if (user.JailTime <= 0)
       {
-        player.SetData("isDead", true);
-
         user.Dead = true;
 
-        if (!player.HasData("reviveSperre") && !player.HasData("inGangWar") && player.GetData<bool>("SAdminduty") == false)
+        if (!player.HasData("reviveSperre") &&  player.GetData<bool>("isDead") == false && !player.HasData("inGangWar") && player.GetData<bool>("SAdminduty") == false)
         {
           //MEDIC AUFTRAG
           MedicTask reviveTask = new MedicTask()
@@ -116,6 +114,8 @@ namespace ReallifeGamemode.Server.Events
           ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " ist soeben verstorben.", new List<int>() { 2 });
         }
 
+        player.SetData("isDead", true);        
+
         if (player.GetUser().IsAdmin(AdminLevel.ADMIN) == true)
         {
           player.TriggerEvent("startDeathTimer", true);
diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
index bcff62c9..9fac5d0f 100644
--- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs
+++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
@@ -274,10 +274,9 @@ namespace ReallifeGamemode.Server.Factions.Medic
 
     }
 
-    [RemoteEvent("delReviveTask")]
-    public static void delReviveTask(Player player)
+    public static void delReviveTask(Player target)
     {
-      MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
+      MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == target.Name);
       if (task != null)
       {
         var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);