diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/+layout.ts b/src/routes/(console)/project-[project]/functions/function-[function]/+layout.ts
index 4ae0fd71d..e57eeef3b 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/+layout.ts
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/+layout.ts
@@ -19,7 +19,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
             Query.equal('type', RuleType.DEPLOYMENT),
             Query.equal('deploymentResourceType', DeploymentResourceType.FUNCTION),
             Query.equal('deploymentResourceId', params.function),
-            Query.equal('deploymentId', func.deployment),
+            Query.equal('deploymentId', func.deploymentId),
             Query.limit(1)
         ]);
 
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index ba34bddea..e6d26d0a9 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -96,7 +96,7 @@
                     <Button secondary href={getDownload(data.deployment.$id)}>Download</Button>
                 {/if}
 
-                {#if data.func.deployment !== data.deployment.$id && data.deployment.status === 'ready'}
+                {#if data.func.deploymentId !== data.deployment.$id && data.deployment.status === 'ready'}
                     <Button
                         disabled={data.activeDeployment}
                         on:click={() => {
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
index 4fcab109f..374b96fd6 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
@@ -14,6 +14,6 @@ export const load: PageLoad = async ({ params, depends, parent }) => {
     return {
         func,
         deployment,
-        activeDeployment: func.deployment === params.deployment
+        activeDeployment: func.deploymentId === params.deployment
     };
 };
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte
index 7cfd4499f..85a9b616e 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte
@@ -136,7 +136,7 @@
                                     }}>
                                     Redeploy
                                 </ActionMenu.Item.Button>
-                                {#if deployment.status === 'ready' && deployment.$id !== $func.deployment}
+                                {#if deployment.status === 'ready' && deployment.$id !== $func.deploymentId}
                                     <ActionMenu.Item.Button
                                         trailingIcon={IconLightningBolt}
                                         on:click={(e) => {