diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index a505bf27922..4e34c335659 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -1014,13 +1014,13 @@
 	rolled_down = !rolled_down
 	if(rolled_down)
 		body_parts_covered &= LOWER_TORSO|LEGS|FEET
-		if(contained_sprite)
+		if(contained_sprite || !LAZYLEN(item_state_slots))
 			item_state = "[initial(item_state)]_d"
 		else
 			item_state_slots[slot_w_uniform_str] = "[worn_state]_d"
 	else
 		body_parts_covered = initial(body_parts_covered)
-		if(contained_sprite)
+		if(contained_sprite || !LAZYLEN(item_state_slots))
 			item_state = initial(item_state)
 		else
 			item_state_slots[slot_w_uniform_str] = "[worn_state]"
@@ -1044,14 +1044,14 @@
 	rolled_sleeves = !rolled_sleeves
 	if(rolled_sleeves)
 		body_parts_covered &= ~(ARMS|HANDS)
-		if(contained_sprite)
+		if(contained_sprite || !LAZYLEN(item_state_slots))
 			item_state = "[initial(item_state)]_r"
 		else
 			item_state_slots[slot_w_uniform_str] = "[worn_state]_r"
 		to_chat(usr, SPAN_NOTICE("You roll up your [src]'s sleeves."))
 	else
 		body_parts_covered = initial(body_parts_covered)
-		if(contained_sprite)
+		if(contained_sprite || !LAZYLEN(item_state_slots))
 			item_state = initial(item_state)
 		else
 			item_state_slots[slot_w_uniform_str] = "[worn_state]"
diff --git a/html/changelogs/geeves-german_engineering.yml b/html/changelogs/geeves-german_engineering.yml
new file mode 100644
index 00000000000..0829c08d6ae
--- /dev/null
+++ b/html/changelogs/geeves-german_engineering.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed some uniforms not working when rolling down or rolling up sleeves."
\ No newline at end of file