diff --git a/web/src/lib/components/photos-page/actions/select-all-assets.svelte b/web/src/lib/components/photos-page/actions/select-all-assets.svelte
index a3ae241ef6..7d1f7c5f9e 100644
--- a/web/src/lib/components/photos-page/actions/select-all-assets.svelte
+++ b/web/src/lib/components/photos-page/actions/select-all-assets.svelte
@@ -2,7 +2,7 @@
   import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte';
   import type { AssetInteractionStore } from '$lib/stores/asset-interaction.store';
   import { type AssetStore, isSelectingAllAssets } from '$lib/stores/assets.store';
-  import { mdiSelectAll, mdiTimerSand } from '@mdi/js';
+  import { mdiSelectAll, mdiSelectRemove } from '@mdi/js';
   import { selectAllAssets } from '$lib/utils/asset-utils';
 
   export let assetStore: AssetStore;
@@ -14,11 +14,12 @@
 
   const handleCancel = () => {
     $isSelectingAllAssets = false;
+    assetInteractionStore.clearMultiselect();
   };
 </script>
 
 {#if $isSelectingAllAssets}
-  <CircleIconButton title="Cancel" icon={mdiTimerSand} on:click={handleCancel} />
+  <CircleIconButton title="Unselect all" icon={mdiSelectRemove} on:click={handleCancel} />
 {:else}
   <CircleIconButton title="Select all" icon={mdiSelectAll} on:click={handleSelectAll} />
 {/if}
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index efa292d74c..5a69e6eea1 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -370,7 +370,6 @@ export const selectAllAssets = async (assetStore: AssetStore, assetInteractionSt
     }
   } catch (error) {
     handleError(error, 'Error selecting all assets');
-  } finally {
     isSelectingAllAssets.set(false);
   }
 };