diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
index 4090924c3ec1..7bf8edcff036 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
@@ -65,6 +65,10 @@ export class UmbTemplateWorkspaceContext
 	}
 
 	override async load(unique: string) {
+		// Reset state before load to ensure we don't short-circuit the load method.
+		// Without this on editing a newly created template we won't get the created data,
+		// rather the initial scaffold.
+		super.resetState();
 		const response = await super.load(unique);
 		if (response.data) {
 			this.setMasterTemplate(response.data.masterTemplate?.unique ?? null);