diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte
index 2223fcbd2e..4d327d322b 100644
--- a/web/src/lib/components/album-page/album-viewer.svelte
+++ b/web/src/lib/components/album-page/album-viewer.svelte
@@ -351,7 +351,9 @@
 			clearSelect={() => (multiSelectAsset = new Set())}
 		>
 			<CircleIconButton title="Select all" logo={SelectAll} on:click={handleSelectAll} />
-			<DownloadAction filename={album.albumName} sharedLinkKey={sharedLink?.key} />
+			{#if sharedLink?.allowDownload || !isPublicShared}
+				<DownloadAction filename={album.albumName} sharedLinkKey={sharedLink?.key} />
+			{/if}
 			{#if isOwned}
 				<RemoveFromAlbum bind:album />
 			{/if}
diff --git a/web/src/lib/components/share-page/individual-shared-viewer.svelte b/web/src/lib/components/share-page/individual-shared-viewer.svelte
index 8657475842..a6a50f091a 100644
--- a/web/src/lib/components/share-page/individual-shared-viewer.svelte
+++ b/web/src/lib/components/share-page/individual-shared-viewer.svelte
@@ -12,6 +12,7 @@
 	import AssetSelectControlBar from '../photos-page/asset-select-control-bar.svelte';
 	import ControlAppBar from '../shared-components/control-app-bar.svelte';
 	import GalleryViewer from '../shared-components/gallery-viewer/gallery-viewer.svelte';
+	import SelectAll from 'svelte-material-icons/SelectAll.svelte';
 	import ImmichLogo from '../shared-components/immich-logo.svelte';
 	import {
 		notificationController,
@@ -53,12 +54,19 @@
 			handleError(e, 'Unable to add assets to shared link');
 		}
 	};
+
+	const handleSelectAll = () => {
+		selectedAssets = new Set(assets);
+	};
 </script>
 
 <section class="bg-immich-bg dark:bg-immich-dark-bg">
 	{#if isMultiSelectionMode}
 		<AssetSelectControlBar assets={selectedAssets} clearSelect={() => (selectedAssets = new Set())}>
-			<DownloadAction filename="immich-shared" sharedLinkKey={sharedLink.key} />
+			<CircleIconButton title="Select all" logo={SelectAll} on:click={handleSelectAll} />
+			{#if sharedLink?.allowDownload}
+				<DownloadAction filename="immich-shared" sharedLinkKey={sharedLink.key} />
+			{/if}
 			{#if isOwned}
 				<RemoveFromSharedLink bind:sharedLink />
 			{/if}