diff --git a/apps/console/src/components/table/GraphQLCell.tsx b/apps/console/src/components/table/GraphQLCell.tsx
index 2384ec8cc..fc700fbaf 100644
--- a/apps/console/src/components/table/GraphQLCell.tsx
+++ b/apps/console/src/components/table/GraphQLCell.tsx
@@ -24,7 +24,7 @@ type Props<Q extends OperationType, T> = {
   | { defaultValue: T[]; multiple: true }
 );
 
-export function GraphQLCell<Q extends OperationType, T>(props: Props<Q, T>) {
+export function GraphQLCell<Q extends OperationType, T extends NonNullable<unknown>>(props: Props<Q, T>) {
   const [value, setValue, valueRef] = useStateWithRef<T | T[] | undefined>(
     props.defaultValue,
   );
diff --git a/apps/console/src/hooks/useMutateField.tsx b/apps/console/src/hooks/useMutateField.tsx
index ef82cd9bb..93ee2a580 100644
--- a/apps/console/src/hooks/useMutateField.tsx
+++ b/apps/console/src/hooks/useMutateField.tsx
@@ -1,9 +1,9 @@
 import type { GraphQLTaggedNode } from "relay-runtime";
 import { useMutation } from "react-relay";
 
-export type MutationFieldUpdate<T> = (
-  field: keyof T,
-  value: T[typeof field],
+export type MutationFieldUpdate<T extends Record<string, unknown>, TKey extends keyof T> = (
+  field: TKey,
+  value: T[TKey],
 ) => void;
 
 /**
diff --git a/packages/hooks/src/useStateWithRef.ts b/packages/hooks/src/useStateWithRef.ts
index c05c4d23a..45c5b932e 100644
--- a/packages/hooks/src/useStateWithRef.ts
+++ b/packages/hooks/src/useStateWithRef.ts
@@ -4,14 +4,18 @@ import { useCallback, useRef, useState } from "react";
  * A useState hook that also returns a ref to the current state (usable in callbacks)
  */
 export function useStateWithRef<T>(initialValue: T) {
-    const [state, setState] = useState(initialValue);
+    const [state, setState] = useState<T>(initialValue);
     const ref = useRef(state);
 
     return [
         state,
-        useCallback((v: T) => {
-            setState(v);
-            ref.current = v;
+        useCallback((v: T | ((prevState: T) => T)) => {
+            setState(prev => {
+                const nextState = typeof v === "function"
+                    ? (v as (prevState: T) => T)(prev) : v;
+                ref.current = nextState;
+                return nextState;
+            });
         }, []),
         ref,
     ] as const;
diff --git a/packages/ui/src/Molecules/Table/SelectCell.tsx b/packages/ui/src/Molecules/Table/SelectCell.tsx
index 583ce2b55..c91ab074f 100644
--- a/packages/ui/src/Molecules/Table/SelectCell.tsx
+++ b/packages/ui/src/Molecules/Table/SelectCell.tsx
@@ -27,13 +27,13 @@ export const selectCell = tv({
     },
 });
 
-export function SelectCell<T>(props: Props<T>) {
+export function SelectCell<T extends NonNullable<unknown>>(props: Props<T>) {
     const [value, setValue, valueRef] = useStateWithRef<T | T[]>(
         props.defaultValue,
     );
     const cellRef = useEditableCellRef();
     const { __ } = useTranslate();
-    const filteredValue = Array.isArray(value) ? value.filter(Boolean) : value ? [value] : [];
+    const filteredValue = Array.isArray(value) ? value.filter(v => v !== undefined) : value ? [value] : [];
     const usedKeys = new Set<string>(filteredValue.map(getKey).filter(Boolean) as string[]);
     const { onUpdate } = useEditableRowContext();
 
@@ -103,12 +103,12 @@ export function SelectCell<T>(props: Props<T>) {
     );
 }
 
-export function SelectValue<T>(props: {
+export function SelectValue<T extends NonNullable<unknown>>(props: {
     itemRenderer: Props<T>["itemRenderer"];
     onValueChange?: (value: T | T[]) => void;
     value: T | T[] | undefined;
 }) {
-    if (!props.value) {
+    if (props.value === undefined) {
         return "";
     }
     if (!Array.isArray(props.value)) {
diff --git a/packages/ui/src/Molecules/Table/TextCell.tsx b/packages/ui/src/Molecules/Table/TextCell.tsx
index 7c39cd6b8..618a17e53 100644
--- a/packages/ui/src/Molecules/Table/TextCell.tsx
+++ b/packages/ui/src/Molecules/Table/TextCell.tsx
@@ -24,7 +24,7 @@ export function TextCell(props: Props) {
         if (props.required && inputValue === "") {
             return;
         }
-        if (inputValue !== props.defaultValue) {
+        if (inputValue !== value) {
             setValue(inputValue);
             onUpdate(props.name, inputValue);
         }