diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte
index 58bfca45c..4f8c836bd 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte
@@ -302,7 +302,7 @@
                     <Layout.Stack direction="row">
                         <InputSelect
                             {id}
-                            required
+                            required={column.required}
                             {options}
                             bind:value={relatedList[0]}
                             placeholder={`Select ${column.key}`}
@@ -321,7 +321,7 @@
                         <Layout.Stack direction="row">
                             <InputSelect
                                 {id}
-                                required
+                                required={column.required}
                                 autofocus={limited}
                                 options={getAvailableOptions(actualIndex)}
                                 bind:value={relatedList[actualIndex]}
@@ -351,7 +351,7 @@
                         <Layout.Stack direction="row">
                             <InputSelect
                                 {id}
-                                required
+                                required={column.required}
                                 options={getAvailableOptions(i)}
                                 bind:value={item}
                                 on:change={updateRelatedList}
@@ -381,7 +381,7 @@
                         <Layout.Stack direction="row">
                             <Input.ComboBox
                                 {id}
-                                required
+                                required={column.required}
                                 on:change={addNewItem}
                                 bind:value={newItemValue}
                                 options={availableOptions}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/string.svelte
index 491d8ceda..1e7c5f8d0 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/string.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/string.svelte
@@ -95,9 +95,20 @@
                 value = newArray as string[] | number[] | boolean[];
             }
         } else {
-            const parsedValue = isSpatialType(column)
-                ? JSON.parse(stringValue)
-                : parseValue(stringValue);
+            let parsedValue = parseValue(stringValue);
+
+            if (isSpatialType(column)) {
+                if (!stringValue?.trim()) {
+                    parsedValue = null;
+                } else {
+                    try {
+                        parsedValue = JSON.parse(stringValue);
+                    } catch {
+                        return;
+                    }
+                }
+            }
+
             if (JSON.stringify(parsedValue) !== JSON.stringify(value)) {
                 value = parsedValue;
             }