diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
index 1e97d40ea8..6467241f2a 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
@@ -227,8 +227,11 @@
                                     size="s"
                                     secondary
                                     class="small-button-dimensions"
-                                    disabled={!(hasColumns && hasValidColumns && data.rows.total) ||
-                                        disableButton}
+                                    disabled={!(
+                                        hasColumns &&
+                                        hasValidColumns &&
+                                        data.rows?.total
+                                    ) || disableButton}
                                     on:click={() => {
                                         trackEvent(Click.DatabaseExportCsv);
                                         goto(getTableExportUrl());
@@ -239,13 +242,13 @@
                                 <svelte:fragment slot="tooltip">Export CSV</svelte:fragment>
                             </Tooltip>
 
-                            <Tooltip disabled={isRefreshing || !data.rows.total} placement="top">
+                            <Tooltip disabled={isRefreshing || !data.rows?.total} placement="top">
                                 <Button
                                     icon
                                     size="s"
                                     secondary
                                     disabled={isRefreshing ||
-                                        !data.rows.total ||
+                                        !data.rows?.total ||
                                         !(hasColumns && hasValidColumns) ||
                                         disableButton}
                                     class="small-button-dimensions"
@@ -299,7 +302,7 @@
 
     <div class="databases-spreadsheet">
         {#if hasColumns && hasValidColumns && $tableColumnSuggestions.force !== true}
-            {#if data.rows.total}
+            {#if data.rows?.total}
                 <Divider />
                 <SpreadSheet {data} bind:showRowCreateSheet={$showRowCreateSheet} />
             {:else if $hasPageQueries}
@@ -347,7 +350,7 @@
                 </EmptySheet>
             {/if}
         {:else if isCloud && canShowSuggestionsSheet}
-            <SuggestionsEmptySheet userColumns={$tableColumns} userDataRows={data.rows.rows} />
+            <SuggestionsEmptySheet userColumns={$tableColumns} userDataRows={data.rows?.rows} />
         {:else}
             <EmptySheet mode="rows" showActions={$canWriteTables} title="You have no columns yet">
                 {#snippet subtitle()}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
index b6b58e8787..fe293e6b8d 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
@@ -396,7 +396,8 @@
                 {@const option = columnOptions.find(
                     (option) =>
                         option.type === column.type &&
-                        option.format === ('format' in column ? column.format : undefined)
+                        option.format ===
+                            ('format' in column && column.format ? column.format : undefined)
                 )}
                 {@const isSelectable =
                     column['system'] || column.type === 'relationship' ? 'disabled' : true}
@@ -425,7 +426,7 @@
                                 {:else if column.key === '$id'}
                                     <Icon icon={IconFingerPrint} size="s" />
                                 {:else}
-                                    <Icon icon={option.icon} size="s" />
+                                    <Icon icon={option?.icon ?? IconViewList} size="s" />
                                 {/if}
 
                                 <Layout.Stack