diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index b02dff1bdbcc..3f653926f8b3 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -253,9 +253,12 @@
 		to_chat(user, SPAN_WARNING("[src] must be equipped before you can switch types."))
 		return
 
-	var/obj/item/weapon/gun/flamer/M240T/flamer = user.get_active_hand()
-	if(!istype(flamer))
-		to_chat(user, SPAN_WARNING("You must be holding [flamer] to use [src]."))
+	if(!linked_flamer)
+		to_chat(user, SPAN_WARNING("An incinerator unit must be linked in order to switch fuel types."))
+		return
+
+	if(user.get_active_hand() != linked_flamer)
+		to_chat(user, SPAN_WARNING("You must be holding [linked_flamer] to use [src]."))
 		return
 
 	if(!active_fuel)
@@ -276,8 +279,8 @@
 
 	to_chat(user, "You switch the fuel tank to <b>[active_fuel.caliber]</b>")
 	playsound(src, 'sound/machines/click.ogg', 25, TRUE)
-	flamer.current_mag = active_fuel
-	flamer.update_icon()
+	linked_flamer.current_mag = active_fuel
+	linked_flamer.update_icon()
 
 	return TRUE