diff --git a/code/game/objects/items/weapons/storage/storage_base.dm b/code/game/objects/items/weapons/storage/storage_base.dm
index 174364442eba..9ae621d46932 100644
--- a/code/game/objects/items/weapons/storage/storage_base.dm
+++ b/code/game/objects/items/weapons/storage/storage_base.dm
@@ -468,20 +468,18 @@
 
 	if(!prevent_warning)
 		// all mobs with clients attached, sans the item's user
-		var/viewer_list = GLOB.player_list - user
 
 		// the item's user will always get a notification
 		to_chat(user, "<span class='notice'>You put [I] into [src].</span>")
 
 		// if the item less than normal sized, only people within 1 tile get the message, otherwise, everybody in view gets it
 		if(I.w_class < WEIGHT_CLASS_NORMAL)
-			for(var/mob/M in viewer_list)
+			for(var/mob/M in range(1, user))
 				if(in_range(M, user))
 					M.show_message("<span class='notice'>[user] puts [I] into [src].</span>")
 		else
 			// restrict player list to include only those in view
-			viewer_list = viewer_list & viewers(world.view, user)
-			for(var/mob/M in viewer_list)
+			for(var/mob/M in oviewers(7, user))
 				M.show_message("<span class='notice'>[user] puts [I] into [src].</span>")
 
 	orient2hud(user)