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 0d58873aeb0..824d0f1a642 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -473,7 +473,7 @@
 		else
 			attach_iv(buckled, usr)
 		return
-	if(ishuman(over_object))
+	if(usr != over_object && ishuman(over_object))
 		if(user_buckle(over_object, usr))
 			attach_iv(buckled, usr)
 			return
diff --git a/html/changelogs/geeves-roller_bed_fix.yml b/html/changelogs/geeves-roller_bed_fix.yml
new file mode 100644
index 00000000000..28858583f14
--- /dev/null
+++ b/html/changelogs/geeves-roller_bed_fix.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - bugfix: "You can now collapse rollerbeds again."