diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index b727ef688cc..c2cc74c0ed6 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -89,6 +89,9 @@
 
 /obj/item/extinguisher/interact_with_atom(atom/target, mob/living/user, list/modifiers)
 	. = ..()
+	if(isstorage(target) || istype(target, /atom/movable/screen))
+		return
+
 	if(attempt_refill(target, user))
 		return ITEM_INTERACT_COMPLETE