diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index dcab42d0681..36f2571886a 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -382,6 +382,8 @@
 			if(src.a_intent != I_HELP)
 				for(var/obj/item/weapon/W in holding)
 					if(W && prob(holding[W]))
+						if(istype(W, /obj/item/weapon/grab))
+							continue
 						if(istype(W,/obj/item/weapon/gun))
 							var/list/turfs = list()
 							for(var/turf/T in view())
diff --git a/html/changelogs/geeves - fuckingGrabs.yml b/html/changelogs/geeves - fuckingGrabs.yml
new file mode 100644
index 00000000000..3f1f64cf19c
--- /dev/null
+++ b/html/changelogs/geeves - fuckingGrabs.yml	
@@ -0,0 +1,7 @@
+
+author: Geeves
+
+delete-after: True
+
+changes: 
+  - bugfix: "You can no longer retaliate against disarm attempts with an in-hand grab."