diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e03d59a..4275137c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## Version 2.0.0-alpha.17
+
+## Changes
+
+- Fixed an unhandled error in Subspace Storage crashing the host.
+
+
 ## Version 2.0.0-alpha.16
 
 ## Changes
diff --git a/plugins/subspace_storage/instance.ts b/plugins/subspace_storage/instance.ts
index 9bc594a8..9771eb26 100644
--- a/plugins/subspace_storage/instance.ts
+++ b/plugins/subspace_storage/instance.ts
@@ -116,7 +116,6 @@ export class InstancePlugin extends BaseInstancePlugin {
 		let itemsJson = lib.escapeString(JSON.stringify(items));
 		let task = this.sendRcon(`/sc __subspace_storage__ UpdateInvData("${itemsJson}")`, true);
 		this.pendingTasks.add(task);
-		task.finally(() => { this.pendingTasks.delete(task); });
-		await task;
+		await task.finally(() => { this.pendingTasks.delete(task); });
 	}
 }