diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 0c77f4aec74..6d90173ee0b 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -703,11 +703,11 @@ Thanks.
 		for(var/i = 1;i<hookshot.maxlength;i++)
 			var/obj/effect/overlay/hookchain/HC = hookshot.links["[i]"]
 			if(HC.loc != hookshot)
-				HC.forceMove(get_step(HC,direct),direct)
+				HC.Move(get_step(HC,direct),direct)
 
 		if(hookshot.hook)
 			var/obj/item/projectile/hookshot/hook = hookshot.hook
-			hook.forceMove(get_step(hook,direct),direct)
+			hook.Move(get_step(hook,direct),direct)
 			if(direct & NORTH)
 				hook.override_starting_Y++
 				hook.override_target_Y++
diff --git a/code/modules/projectiles/guns/hookshot.dm b/code/modules/projectiles/guns/hookshot.dm
index 07af60a6f49..76bdff55efb 100644
--- a/code/modules/projectiles/guns/hookshot.dm
+++ b/code/modules/projectiles/guns/hookshot.dm
@@ -298,6 +298,7 @@
 /obj/effect/overlay/hookchain/Destroy()
 	if(shot_from)
 		shot_from.panic = 1
+		shot_from = null
 	..()
 
 //THE CHAIN THAT TETHERS STUFF TOGETHER