diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
index 91fe3eb9..470850f2 100644
--- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs
+++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
@@ -201,8 +201,8 @@ namespace ReallifeGamemode.Server.Factions.Medic
       {
         foreach (var task in HealTasks)
         {
-          var taskActive = Math.Abs((int)(((DateTimeOffset)new DateTime()).ToUnixTimeSeconds() - ((DateTimeOffset)task.Time).ToUnixTimeSeconds()));
-          if (taskActive > 600)
+          var taskActive = DateTime.Now - task.Time;
+          if (taskActive > TimeSpan.FromMinutes(-10) && task.MedicName == "none")
           {
             delHealTask(PlayerService.GetPlayerByNameOrId(task.Victim));
           }