diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 9ac452db9f..16b401b454 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -173,10 +173,10 @@
 
 //this is largely hacky and bad :(	-Pete //less hacky and bad now :) -Ghost
 /obj/item/gun/projectile/shotgun/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob)
-	if(sawn_off)
-		to_chat(user, span_warning("The [src] is already shortened!"))
-		return
 	if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter))
+		if(sawn_off)
+			to_chat(user, span_warning("The [src] is already shortened!"))
+			return
 		to_chat(user, span_notice("You begin to shorten the barrel of \the [src]."))
 		if(loaded.len)
 			var/burstsetting = burst