diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
index 404a5ef496b..2e6855b173b 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
@@ -10,13 +10,14 @@
 /obj/structure/stool/bed/nest/manual_unbuckle(mob/user as mob)
 	if(buckled_mob)
 		if(buckled_mob.buckled == src)
-			if((buckled_mob != user) && (!user.buckled))
-				buckled_mob.visible_message(\
-					"<span class='notice'>[user.name] pulls [buckled_mob.name] free from the sticky nest!</span>",\
-					"<span class='notice'>[user.name] pulls you free from the gelatinous resin.</span>",\
-					"<span class='notice'>You hear squelching...</span>")
-				buckled_mob.pixel_y = 0
-				unbuckle()
+			if(buckled_mob != user)
+				if(!(user.buckled))
+					buckled_mob.visible_message(\
+						"<span class='notice'>[user.name] pulls [buckled_mob.name] free from the sticky nest!</span>",\
+						"<span class='notice'>[user.name] pulls you free from the gelatinous resin.</span>",\
+						"<span class='notice'>You hear squelching...</span>")
+					buckled_mob.pixel_y = 0
+					unbuckle()
 			else
 				buckled_mob.visible_message(\
 					"<span class='warning'>[buckled_mob.name] struggles to break free of the gelatinous resin...</span>",\
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index c730ce52a6e..7040271bbfb 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -47,17 +47,19 @@
 /obj/structure/stool/bed/proc/manual_unbuckle(mob/user as mob)
 	if(buckled_mob)
 		if(buckled_mob.buckled == src)
-			if((buckled_mob != user) && (!user.buckled))
-				buckled_mob.visible_message(\
-					"\blue [buckled_mob.name] was unbuckled by [user.name]!",\
-					"You were unbuckled from [src] by [user.name].",\
-					"You hear metal clanking")
+			if(buckled_mob != user)
+				if(!(user.buckled))
+					buckled_mob.visible_message(\
+						"\blue [buckled_mob.name] was unbuckled by [user.name]!",\
+						"You were unbuckled from [src] by [user.name].",\
+						"You hear metal clanking")
+					unbuckle()
 			else
 				buckled_mob.visible_message(\
 					"\blue [buckled_mob.name] unbuckled \himself!",\
 					"You unbuckle yourself from [src].",\
 					"You hear metal clanking")
-			unbuckle()
+					unbuckle()
 			src.add_fingerprint(user)
 	return