diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index b9da9b34bb3..0d26a27bbd8 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -164,8 +164,10 @@
 
 	var/show_message = FALSE
 	for(var/atom/thing as anything in tile)
-		if(is_type_in_typecache(thing, atom_storage.can_hold))
-			show_message ||= pickup_ore(thing, user, box)
+		if(!is_type_in_typecache(thing, atom_storage.can_hold))
+			continue
+		if(pickup_ore(thing, user, box))
+			show_message = TRUE
 
 	if (!show_message)
 		spam_protection = FALSE