diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index d8aca26b9db..2fb3d71077a 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -906,6 +906,9 @@ class App {
 
 							// Also set it in the returned data
 							workflow.active = false;
+
+							// Now return the original error for UI to display
+							throw error;
 						}
 					}
 
diff --git a/packages/editor-ui/src/components/mixins/workflowHelpers.ts b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
index 0fa1fa439e1..298e354fb5d 100644
--- a/packages/editor-ui/src/components/mixins/workflowHelpers.ts
+++ b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
@@ -463,13 +463,6 @@ export const workflowHelpers = mixins(
 
 					const workflowData = await this.restApi().updateWorkflow(currentWorkflow, workflowDataRequest);
 
-					// Explicitly commit active state change
-					// if (triggerIsRemoved) {
-					// 	this.$store.commit('setActive', false);
-					// 	this.$store.commit('setWorkflowInactive', workflowData.id);
-					// 	this.$externalHooks().run('workflow.activeChangeCurrent', { workflowId: workflowData.id, active: false });
-					// }
-
 					if (name) {
 						this.$store.commit('setWorkflowName', {newName: workflowData.name});
 					}