diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx
index ecd95e0ad71..c2cd7c1c4dd 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx
@@ -90,7 +90,9 @@ const ColumnEditor: FC<Props> = ({
     setErrors(updatedErrors)
   }
 
-  const saveColumnForeignKey = (foreignKeyConfiguration: any) => {
+  const saveColumnForeignKey = (
+    foreignKeyConfiguration: { table: PostgresTable; column: PostgresColumn } | undefined
+  ) => {
     onUpdateField({
       foreignKey: !isUndefined(foreignKeyConfiguration)
         ? {
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx
index 6573eebe098..0a27d975522 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx
@@ -15,7 +15,7 @@ interface Props {
   metadata?: any
   visible: boolean
   closePanel: () => void
-  saveChanges: (value: any) => void
+  saveChanges: (value: { table: PostgresTable; column: PostgresColumn } | undefined) => void
 }
 
 const ForeignKeySelector: FC<Props> = ({
@@ -92,7 +92,7 @@ const ForeignKeySelector: FC<Props> = ({
     }
     setErrors(errors)
     if (isEmpty(errors)) {
-      if (!selectedTable) {
+      if (!selectedTable || !selectedColumn) {
         // Remove foreign key since no table selected
         saveChanges(undefined)
       } else {