diff --git a/ReallifeGamemode.Client/Interaction/factioninteraction.ts b/ReallifeGamemode.Client/Interaction/factioninteraction.ts
index 1dbb710c..592c816f 100644
--- a/ReallifeGamemode.Client/Interaction/factioninteraction.ts
+++ b/ReallifeGamemode.Client/Interaction/factioninteraction.ts
@@ -272,8 +272,8 @@ export default function factionInteraction(globalData: IGlobalData) {
                     factionInteractionMenu.Close();
                     mp.gui.chat.activate(true);
                     globalData.InMenu = false;
-                    mp.events.call("destroyMedicTaskCheckpoint");
                     mp.events.callRemote("updateMedicTask", 1, activeTask.Victim, true);
+                    mp.events.call("destroyMedicTaskCheckpoint");             
                     break;
 
             }
@@ -370,7 +370,7 @@ export default function factionInteraction(globalData: IGlobalData) {
                         healTaskMenuMedic.Close();
                         factionInteractionMenu.Visible = true;
                     } else {
-                        if (tasks[index].MedicName === "none") {
+                        if (tasks[index].MedicName === "none" && tasks[index].MedicName != mp.players.local.name) {
                             mp.game.graphics.requestStreamedTextureDict("medicimages", true);
                             mp.events.callRemote("updateMedicTask", 1, tasks[index].Victim, false);
                             mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y);