diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 8765c5c59287..b86586ecfbcc 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -120,7 +120,7 @@
 		UnarmedAttack(A, FALSE, modifiers)
 		return
 	
-	if(grab_mode && pulled(A))
+	if(grab_mode && pulled(A) && !in_throw_mode)
 		return
 
 	if(in_throw_mode)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 64d837b981f6..7ca700817064 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -366,7 +366,7 @@
 
 	if(istype(AM) && Adjacent(AM))
 		start_pulling(AM)
-	else if(!combat_mode)
+	else if(!in_throw_mode)
 		stop_pulling()
 	return TRUE