diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 8d366824757..6d9c94f4b6c 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -128,7 +128,7 @@
 			var/image/gun_overlay = I
 			if(gun_overlay.icon == gun_gui_icons && dd_hasprefix(gun_overlay.icon_state, "[safety_icon]"))
 				overlays -= gun_overlay
-		if(ismob(loc))
+		if(!isturf(loc)) // In a mob, holster or bag or something
 			overlays += image(gun_gui_icons,"[safety_icon][safety()]")
 
 //Checks whether a given mob can use the gun
diff --git a/html/changelogs/holstered_safeties.yml b/html/changelogs/holstered_safeties.yml
new file mode 100644
index 00000000000..ab1abc86b7e
--- /dev/null
+++ b/html/changelogs/holstered_safeties.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes: 
+  - bugfix: "Holstered guns keep their safety icons."
\ No newline at end of file