diff --git a/ReallifeGamemode.Client/Interaction/factioninteraction.ts b/ReallifeGamemode.Client/Interaction/factioninteraction.ts
index 54a1d799..e8e905cf 100644
--- a/ReallifeGamemode.Client/Interaction/factioninteraction.ts
+++ b/ReallifeGamemode.Client/Interaction/factioninteraction.ts
@@ -428,8 +428,19 @@ export default function factionInteraction(globalData: IGlobalData) {
 
     mp.events.add('updateHealCheckpoint', (xPos, yPos, zPos) => {
         if (activeTask && activeTask.Type == 1) {
-            activeCheckpoint.setCoords(xPos, yPos, zPos, false, false, false, false);
-            mp.game.ui.setNewWaypoint(xPos, yPos);
+            if (activeCheckpoint && mp.checkpoints.exists(activeCheckpoint)) {
+                activeCheckpoint.destroy();
+                activeCheckpoint = mp.checkpoints.new(4, new mp.Vector3(xPos, yPos, zPos - 2), 3.0,
+                    {
+                        color: [255, 0, 0, 150],
+                        visible: true,
+                        dimension: 0
+                    });
+                mp.game.ui.setNewWaypoint(xPos, yPos);
+                taskFinish.x = xPos;
+                taskFinish.y = yPos;
+                taskFinish.z = zPos;
+            }
         }
     });