diff --git a/code/modules/mob/living/silicon/!silicon_mob.dm b/code/modules/mob/living/silicon/!silicon_mob.dm
index 0287fa7065d..e2f7253cda5 100644
--- a/code/modules/mob/living/silicon/!silicon_mob.dm
+++ b/code/modules/mob/living/silicon/!silicon_mob.dm
@@ -596,9 +596,6 @@
 		drop_hat()
 	. = ..()
 
-/mob/living/silicon/grabbedby(mob/living/user)
-	remove_from_head(user)
-
 /mob/living/silicon/examine(mob/user)
 	. = ..()
 	if(silicon_hat)
diff --git a/code/modules/mob/living/silicon/robot/!robot_mob.dm b/code/modules/mob/living/silicon/robot/!robot_mob.dm
index 2d5a822c05c..5214dcb1fc6 100644
--- a/code/modules/mob/living/silicon/robot/!robot_mob.dm
+++ b/code/modules/mob/living/silicon/robot/!robot_mob.dm
@@ -1703,11 +1703,3 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 		old_ai.connected_robots -= src
 	if(connected_ai)
 		connected_ai.connected_robots |= src
-
-/datum/emote/flip/run_emote(mob/user, params, type_override, intentional)
-	. = ..()
-	if(isrobot(user))
-		var/mob/living/silicon/robot/borg = user
-		if(borg.drop_hat())
-			borg.visible_message("<span class='warning'><span class='name'>[src]</span> drops their hat!</span>",
-							"<span class='warning'>Your hat falls off!</span>")
diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index 7cf7fec5fd2..a43af4749c7 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -1,5 +1,5 @@
 /mob/living/silicon/grabbedby(mob/living/user)
-	return
+	remove_from_head(user)
 
 /mob/living/silicon/attack_alien(mob/living/carbon/alien/humanoid/M)
 	if(..()) //if harm or disarm intent
diff --git a/code/modules/mob/mob_emote.dm b/code/modules/mob/mob_emote.dm
index 4473f099c22..497031a8d65 100644
--- a/code/modules/mob/mob_emote.dm
+++ b/code/modules/mob/mob_emote.dm
@@ -159,6 +159,12 @@
 
 	user.SpinAnimation(5, 1)
 
+	if(isrobot(user))
+		var/mob/living/silicon/robot/borg = user
+		if(borg.drop_hat())
+			borg.visible_message("<span class='warning'><span class='name'>[user]</span> drops their hat!</span>",
+							"<span class='warning'>As you flip your hat falls off!</span>")
+
 	if(prob(5) && ishuman(user))
 		message = "attempts a flip and crashes to the floor!"
 		sleep(0.3 SECONDS)