From 43fe558459fa7d169fa578e05f845e304c545c22 Mon Sep 17 00:00:00 2001
From: "Abdulazez (Abza)" <abdulazez.zeinu@aait.edu.et>
Date: Fri, 22 May 2026 07:40:40 +0300
Subject: [PATCH] fix: prevent crash when removing last dropdown option in
 removeValue (#2843)

---
 .../app/components/forms/editor/editor-field-dropdown-form.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/remix/app/components/forms/editor/editor-field-dropdown-form.tsx b/apps/remix/app/components/forms/editor/editor-field-dropdown-form.tsx
index b9789c177..c5b897b8d 100644
--- a/apps/remix/app/components/forms/editor/editor-field-dropdown-form.tsx
+++ b/apps/remix/app/components/forms/editor/editor-field-dropdown-form.tsx
@@ -116,11 +116,12 @@ export const EditorFieldDropdownForm = ({
     }
 
     const newValues = [...currentValues];
+    const removedValue = currentValues[index].value;
     newValues.splice(index, 1);
 
     form.setValue('values', newValues);
 
-    if (form.getValues('defaultValue') === newValues[index].value) {
+    if (form.getValues('defaultValue') === removedValue) {
       form.setValue('defaultValue', undefined);
     }
   };