diff --git a/src/routes/(app)/workspace/prompts/create/+page.svelte b/src/routes/(app)/workspace/prompts/create/+page.svelte
index f4c9a7c0d4..f6abf0e222 100644
--- a/src/routes/(app)/workspace/prompts/create/+page.svelte
+++ b/src/routes/(app)/workspace/prompts/create/+page.svelte
@@ -49,7 +49,7 @@
 				title: _prompt.title,
 				command: _prompt.command,
 				content: _prompt.content,
-				access_control: null
+				access_control: _prompt.access_control !== undefined ? _prompt.access_control : {}
 			};
 		});
 
@@ -68,7 +68,7 @@
 				title: _prompt.title,
 				command: _prompt.command,
 				content: _prompt.content,
-				access_control: null
+				access_control: _prompt.access_control !== undefined ? _prompt.access_control : {}
 			};
 		}
 	});
diff --git a/src/routes/(app)/workspace/tools/create/+page.svelte b/src/routes/(app)/workspace/tools/create/+page.svelte
index c50ca44cce..0b237cc685 100644
--- a/src/routes/(app)/workspace/tools/create/+page.svelte
+++ b/src/routes/(app)/workspace/tools/create/+page.svelte
@@ -87,7 +87,7 @@
 			name={tool?.name ?? ''}
 			meta={tool?.meta ?? { description: '' }}
 			content={tool?.content ?? ''}
-			access_control={null}
+			accessControl={tool?.access_control !== undefined ? tool.access_control : {}}
 			{clone}
 			onSave={(value) => {
 				saveHandler(value);