diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/delete.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/delete.svelte
index 1f24560dc..ca4cc1fdb 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/delete.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/delete.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { goto, invalidate } from '$app/navigation';
+    import { page } from '$app/state';
     import { base } from '$app/paths';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import Confirm from '$lib/components/confirm.svelte';
@@ -14,7 +15,7 @@
     let error: string;
     async function handleDelete() {
         try {
-            await sdk.forProject($project.region, $project.$id).webhooks.delete({
+            await sdk.forProject(page.params.region, $project.$id).webhooks.delete({
                 webhookId: $webhook.$id
             });
             await invalidate(Dependencies.WEBHOOKS);
@@ -24,7 +25,7 @@
                 message: `${$webhook.name} has been deleted`
             });
             trackEvent(Submit.WebhookDelete);
-            await goto(`${base}/project-${$project.region}-${$project.$id}/settings/webhooks`);
+            await goto(`${base}/project-${page.params.region}-${$project.$id}/settings/webhooks`);
         } catch (e) {
             error = e.message;
             trackError(e, Submit.WebhookDelete);
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte
index be6e302e3..f3ee02264 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte
@@ -114,10 +114,10 @@
             if (specs && specs.specifications?.length) {
                 const enabledSpecs = specs.specifications.filter((s) => s.enabled);
                 const fallbackSlug = enabledSpecs[0]?.slug ?? specs.specifications[0]?.slug;
-                if (!specs.specifications.some((s) => s.slug === site.buildSpecification)) {
+                if (!enabledSpecs.some((s) => s.slug === site.buildSpecification)) {
                     site.buildSpecification = fallbackSlug;
                 }
-                if (!specs.specifications.some((s) => s.slug === site.runtimeSpecification)) {
+                if (!enabledSpecs.some((s) => s.slug === site.runtimeSpecification)) {
                     site.runtimeSpecification = fallbackSlug;
                 }
             }
@@ -133,14 +133,12 @@
         }
         // only allow enabled specsification for it
         const enabledSpecs = specs?.specifications?.filter((s) => s.enabled) ?? [];
-        let specToSend = enabledSpecs.some((s) => s.slug === site.buildSpecification)
+        const specToSend = enabledSpecs.some((s) => s.slug === site.buildSpecification)
             ? site.buildSpecification
             : enabledSpecs[0]?.slug;
-        site.buildSpecification = specToSend;
-        let runtimeSpecToSend = enabledSpecs.some((s) => s.slug === site.runtimeSpecification)
+        const runtimeSpecToSend = enabledSpecs.some((s) => s.slug === site.runtimeSpecification)
             ? site.runtimeSpecification
             : enabledSpecs[0]?.slug;
-        site.runtimeSpecification = runtimeSpecToSend;
         try {
             await sdk.forProject(page.params.region, page.params.project).sites.update({
                 siteId: site.$id,
@@ -163,6 +161,8 @@
                 buildSpecification: specToSend || undefined,
                 runtimeSpecification: runtimeSpecToSend || undefined
             });
+            site.buildSpecification = specToSend;
+            site.runtimeSpecification = runtimeSpecToSend;
             await invalidate(Dependencies.SITE);
             addNotification({
                 message: 'Build settings have been updated',