diff --git a/frontend/src/lib/components/ContentSearchInner.svelte b/frontend/src/lib/components/ContentSearchInner.svelte
index 8b20855193..d3030254ad 100644
--- a/frontend/src/lib/components/ContentSearchInner.svelte
+++ b/frontend/src/lib/components/ContentSearchInner.svelte
@@ -363,11 +363,7 @@
 								>
 									Open
 								</Button>
-								<Button
-									href={`/apps/edit/${item.path}?no_draft=true`}
-									target="_blank"
-									startIcon={{ icon: Edit }}
-								>
+								<Button href={`/apps/edit/${item.path}`} target="_blank" startIcon={{ icon: Edit }}>
 									Edit
 								</Button>
 							{/snippet}
diff --git a/frontend/src/lib/components/common/table/AppRow.svelte b/frontend/src/lib/components/common/table/AppRow.svelte
index 62e82c447d..19eade88c6 100644
--- a/frontend/src/lib/components/common/table/AppRow.svelte
+++ b/frontend/src/lib/components/common/table/AppRow.svelte
@@ -128,7 +128,7 @@
 							variant="subtle"
 							wrapperClasses="w-20"
 							startIcon={{ icon: Pen }}
-							href="{base}/apps{app.raw_app ? '_raw' : ''}/edit/{app.path}?nodraft=true"
+							href="{base}/apps{app.raw_app ? '_raw' : ''}/edit/{app.path}"
 						>
 							Edit
 						</Button>
diff --git a/frontend/src/lib/components/common/table/FlowRow.svelte b/frontend/src/lib/components/common/table/FlowRow.svelte
index b7fa203119..2e243f4268 100644
--- a/frontend/src/lib/components/common/table/FlowRow.svelte
+++ b/frontend/src/lib/components/common/table/FlowRow.svelte
@@ -103,7 +103,7 @@
 	aiId={`flow-row-${flow.path}`}
 	aiDescription={`Button to access the form to run the flow ${flow.summary ?? flow.path}`}
 	href={flow.draft_only
-		? `${base}/flows/edit/${flow.path}?nodraft=true`
+		? `${base}/flows/edit/${flow.path}`
 		: `${base}/flows/get/${flow.path}?workspace=${$workspaceStore}`}
 	kind="flow"
 	workspaceId={flow.workspace_id ?? $workspaceStore ?? ''}
diff --git a/frontend/src/lib/utils/editInFork.ts b/frontend/src/lib/utils/editInFork.ts
index 2a0768694d..aa6d653961 100644
--- a/frontend/src/lib/utils/editInFork.ts
+++ b/frontend/src/lib/utils/editInFork.ts
@@ -9,13 +9,13 @@ export function buildForkEditUrl(itemType: ItemType, itemPath: string): string {
 			editPath = `${base}/scripts/edit/${itemPath}`
 			break
 		case 'flow':
-			editPath = `${base}/flows/edit/${itemPath}?nodraft=true`
+			editPath = `${base}/flows/edit/${itemPath}`
 			break
 		case 'app':
-			editPath = `${base}/apps/edit/${itemPath}?nodraft=true`
+			editPath = `${base}/apps/edit/${itemPath}`
 			break
 		case 'raw_app':
-			editPath = `${base}/apps_raw/edit/${itemPath}?nodraft=true`
+			editPath = `${base}/apps_raw/edit/${itemPath}`
 			break
 	}
 	return `${base}/user/fork_workspace?rd=${encodeURIComponent(editPath)}`
diff --git a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
index dff54785ea..e351226a7f 100644
--- a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
@@ -341,7 +341,7 @@
 			buttons.push({
 				label: 'Edit',
 				buttonProps: {
-					href: `${base}/flows/edit/${path}?nodraft=true`,
+					href: `${base}/flows/edit/${path}`,
 					variant: 'accent',
 					unifiedSize: 'md',
 					disabled: !can_write || !showEditButtons,
diff --git a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
index 05b53ece63..ac31c9e52d 100644
--- a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
@@ -676,7 +676,7 @@
 				{#if !$userStore?.operator}
 					{#if canWrite(job?.script_path ?? '', {}, $userStore)}
 						<Button
-							href={`${stem}/edit/${job?.script_path}?workspace=${$workspaceStore}${isScript ? `` : `&nodraft=true`}`}
+							href={`${stem}/edit/${job?.script_path}?workspace=${$workspaceStore}`}
 							on:click={() => {
 								$initialArgsStore = job?.args
 							}}