diff --git a/changelog.md b/changelog.md
index e1a68ee6..93545632 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # Item Piles Changelog
 
+## Version 2.8.15
+
+- Fixed players not being able to sort vaults
+
 ## Version 2.8.14
 
 - Fixed issue with not being able to drop items into vault
diff --git a/src/applications/vault-app/vault-shell.svelte b/src/applications/vault-app/vault-shell.svelte
index 9f6e59aa..952be4eb 100644
--- a/src/applications/vault-app/vault-shell.svelte
+++ b/src/applications/vault-app/vault-shell.svelte
@@ -415,12 +415,14 @@
 
 			<div class="item-piles-flexrow" style="margin-top: 0.25rem; flex:0 1 auto;">
 
-				<div style="flex: 0 1 auto;">
-					<button type="button" class="item-piles-small-button" on:click={(event) => store.sortItemsOnGrid(event)}
-					        data-tooltip={localize("ITEM-PILES.Vault.SortItemsTooltip")}>
-						{localize("ITEM-PILES.Vault.SortItems")}
-					</button>
-				</div>
+				{#if gridData.canOrganize}
+					<div style="flex: 0 1 auto;">
+						<button type="button" class="item-piles-small-button" on:click={(event) => store.sortItemsOnGrid(event)}
+						        data-tooltip={localize("ITEM-PILES.Vault.SortItemsTooltip")}>
+							{localize("ITEM-PILES.Vault.SortItems")}
+						</button>
+					</div>
+				{/if}
 
 				<CurrencyList {currencies}
 				              options={{ abbreviations: false, imgSize: 18, abbreviateNumbers: true }}
diff --git a/src/stores/vault-store.js b/src/stores/vault-store.js
index eaaa0599..8b59d2af 100644
--- a/src/stores/vault-store.js
+++ b/src/stores/vault-store.js
@@ -422,8 +422,10 @@ export class VaultStore extends ItemPileStore {
 			[CONSTANTS.FLAGS.ITEM]: PileUtilities.cleanItemFlagData(PileUtilities.getItemFlagData(item))
 		}))
 
-		await this.actor.updateEmbeddedDocuments("Item", itemUpdates);
-		await this.actor.deleteEmbeddedDocuments("Item", deletions);
+		return ItemPileSocket.executeAsGM(ItemPileSocket.HANDLERS.COMMIT_ACTOR_CHANGES, this.actor.uuid, {
+			itemsToUpdate: itemUpdates,
+			itemsToDelete: deletions
+		});
 
 	}