From 562a967a2686bc7757fa012f4cf8caacf795df01 Mon Sep 17 00:00:00 2001
From: labkey-matthewb <matthewb@labkey.com>
Date: Wed, 5 Nov 2025 09:55:27 -0800
Subject: [PATCH] Treat "" as null for choice column

---
 api/src/org/labkey/api/data/DataColumn.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/api/src/org/labkey/api/data/DataColumn.java b/api/src/org/labkey/api/data/DataColumn.java
index 377392d4664..9bca27b3d70 100644
--- a/api/src/org/labkey/api/data/DataColumn.java
+++ b/api/src/org/labkey/api/data/DataColumn.java
@@ -712,7 +712,10 @@ else if (_inputType.equalsIgnoreCase("checkbox"))
             {
                 IPropertyValidator textChoiceValidator = PropertyService.get().getValidatorForColumn(_boundColumn, PropertyValidatorType.TextChoice);
                 if (textChoiceValidator != null)
-                    renderTextChoiceFormInput(out, formFieldName, value, List.of(strVal), disabledInput, textChoiceValidator);
+                {
+                    List<String> strVals = StringUtils.isEmpty(strVal) ? List.of() : List.of(strVal);
+                    renderTextChoiceFormInput(out, formFieldName, value, strVals, disabledInput, textChoiceValidator);
+                }
                 else
                     renderTextFormInput(out, formFieldName, value, strVal, disabledInput);
             }