diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte
index 9fbbf939f..f0c33b1cf 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte
@@ -24,7 +24,15 @@
 
     onMount(async () => {
         installations = await sdk.forProject.vcs.listInstallations();
-
+        if (!site?.installationId && installations.total > 0) {
+            installation.set(installations.installations[0]);
+        }
+        if (!$repository?.id && hasRepository) {
+            $repository = await sdk.forProject.vcs.getRepository(
+                $installation.$id,
+                site.providerRepositoryId
+            );
+        }
         console.log(installations);
     });
 
@@ -95,7 +103,7 @@
                 <Layout.Stack direction="row" alignItems="center" gap="s">
                     <Icon size="s" icon={IconGithub} />
                     <Typography.Text variant="m-400" color="--color-fgcolor-neutral-primary">
-                        {$repository.organization}/{$repository.name}
+                        {$repository?.organization}/{$repository?.name}
                     </Typography.Text>
                 </Layout.Stack>
             </Layout.Stack>
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte
index 48a183d74..7765d80d9 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte
@@ -14,7 +14,7 @@
     import UpdateRepository from './updateRepository.svelte';
     import { onMount } from 'svelte';
     import { showConnectRepo } from './store';
-    // import UpdateSpa from './updateSPA.svelte';
+    import UpdateSpa from './updateSPA.svelte';
 
     export let data;
 
@@ -59,7 +59,7 @@
         variableList={data.variables}
         product="site" />
     <UpdateTimeout site={data.site} />
-    <!-- <UpdateSpa site={data.site} /> -->
+    <UpdateSpa site={data.site} />
     <UpdateRuntimeSettings site={data.site} frameworks={data.frameworks.frameworks} />
     <DangerZone site={data.site} />
 </Container>
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateSPA.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateSPA.svelte
index 2f106bfa9..e2b28c3bf 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateSPA.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateSPA.svelte
@@ -23,6 +23,7 @@
 
     async function updateSPA() {
         try {
+            console.log(spa);
             await sdk.forProject.sites.update(
                 site.$id,
                 site.name,
@@ -75,7 +76,6 @@
                             id="fallback"
                             label="Fallback"
                             placeholder="Enter fallback"
-                            required
                             bind:value={fallback} />
                     {/if}
                 </Layout.Stack>
@@ -83,7 +83,8 @@
         </svelte:fragment>
 
         <svelte:fragment slot="actions">
-            <Button submit>Update</Button>
+            <Button disabled={spa ? site.adapter === 'static' : site.adapter === 'ssr'} submit
+                >Update</Button>
         </svelte:fragment>
     </CardGrid>
 </Form>