diff --git a/binaries/data/mods/public/gui/session/unit_actions.js b/binaries/data/mods/public/gui/session/unit_actions.js
index 3dad46b28a..11816a5cf6 100644
--- a/binaries/data/mods/public/gui/session/unit_actions.js
+++ b/binaries/data/mods/public/gui/session/unit_actions.js
@@ -914,9 +914,16 @@ var g_EntityCommands =
 		},
 		"execute": function(entState)
 		{
+			let entities = [];
+			for (let ent of g_Selection.toList())
+			{
+				let state = GetExtendedEntityState(ent);
+				if (state && state.resourceDropsite && state.resourceDropsite.sharable)
+					entities.push(state.id);
+			}
 			Engine.PostNetworkCommand({
 				"type": "set-dropsite-sharing",
-				"entities": [entState.id],
+				"entities": entities,
 				"shared": !entState.resourceDropsite.shared
 			});
 		},