diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js
index 3e9ff32d5e..38ffac1220 100644
--- a/frappe/core/doctype/user/user.js
+++ b/frappe/core/doctype/user/user.js
@@ -3,7 +3,7 @@ frappe.ui.form.on("User", {
 		frm.set_query("default_workspace", () => {
 			return {
 				filters: {
-					for_user: ["in", [null, frappe.session.user]],
+					for_user: ["in", ["", frappe.session.user]],
 					title: ["!=", "Welcome Workspace"],
 				},
 			};
diff --git a/frappe/database/operator_map.py b/frappe/database/operator_map.py
index dc4c17c5d3..c8cb9aa099 100644
--- a/frappe/database/operator_map.py
+++ b/frappe/database/operator_map.py
@@ -48,6 +48,10 @@ def func_in(key: Field, value: list | tuple) -> frappe.qb:
 	"""
 	if isinstance(value, str):
 		value = value.split(",")
+
+	value = ["" if v is None else v for v in value]
+	if "" in value:
+		return Coalesce(key, "").isin(value)
 	return key.isin(value)