diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm
index cfae77b2350..0c3f5702e7d 100644
--- a/code/game/dna/genes/monkey.dm
+++ b/code/game/dna/genes/monkey.dm
@@ -11,9 +11,13 @@
 	if(!istype(H,/mob/living/carbon/human))
 //		testing("Cannot monkey-ify [M], type is [M.type].")
 		return
+	if(issmall(H)) // Already a monkey
+		return
 	for(var/obj/item/W in H)
 		if (W==H.w_uniform) // will be torn
 			continue
+		if(istype(W,/obj/item/organ))
+			continue
 		H.unEquip(W)
 	H.regenerate_icons()
 	H.canmove = 0
@@ -57,6 +61,8 @@
 	for(var/obj/item/W in H)
 		if (W==H.w_uniform) // will be torn
 			continue
+		if(istype(W,/obj/item/organ))
+			continue
 		H.unEquip(W)
 	H.regenerate_icons()
 	H.canmove = 0
diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm
index 08268e38994..58990646823 100644
--- a/code/modules/mob/living/carbon/human/species/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/monkey.dm
@@ -45,6 +45,9 @@ datum/species/monkey/get_random_name(var/gender)
 	H.name = H.real_name
 	..()
 
+/datum/species/monkey/handle_dna(var/mob/living/carbon/human/H)
+	H.dna.SetSEState(MONKEYBLOCK,1)
+
 /datum/species/monkey/tajaran
 	name = "Farwa"