diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index e91a53f2768..255615edf1a 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -111,12 +111,12 @@
 			var/obj/item/foldable = new src.foldable()
 			qdel(src)
 			user.put_in_hands(foldable) //try to put it inhands if possible
-		if(ispath(src.trash))
-			if(contents.len &&  user.a_intent == I_HURT)  // only crumple with things inside on harmintent.
+		if(ispath(src.trash) && user.a_intent == I_HURT)
+			if(!contents.len)
+				to_chat(user, SPAN_NOTICE("You crumple up \the [src]."))
+			else
 				user.visible_message(SPAN_DANGER("You crush \the [src], spilling its contents everywhere!"), SPAN_DANGER("[user] crushes \the [src], spilling its contents everywhere!"))
 				spill()
-			else
-				to_chat(user, SPAN_NOTICE("You crumple up \the [src].")) //make trash
 			playsound(src.loc, 'sound/items/pickup/wrapper.ogg', 30, 1)
 			var/obj/item/trash = new src.trash()
 			qdel(src)
diff --git a/html/changelogs/wezzy_crumplefix.yml b/html/changelogs/wezzy_crumplefix.yml
new file mode 100644
index 00000000000..7d118a8746d
--- /dev/null
+++ b/html/changelogs/wezzy_crumplefix.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "You should only be able to crumple trashable items on harm intent now."