diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index b6775f91684..926ddfb16cb 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -713,6 +713,12 @@ obj/item/weapon/gun/Destroy()
 		to_chat(user, "<span class='notice'>You attach \the [I] to the front of \the [src].</span>")
 		update_icon()
 
+	if(iscrowbar(I) && bayonet)
+		to_chat(user, "<span class='notice'>You detach \the [bayonet] from \the [src].</span>")
+		bayonet.forceMove(get_turf(src))
+		bayonet = null
+		update_icon()
+
 	if(!pin)
 		return ..()
 
diff --git a/html/changelogs/alberyk-bayonet.yml b/html/changelogs/alberyk-bayonet.yml
new file mode 100644
index 00000000000..c1be80431e0
--- /dev/null
+++ b/html/changelogs/alberyk-bayonet.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - rscadd: "You can now remove bayonets from guns using crowbars."