diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/ItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/ItemDropdownEntryFieldModel.swift
index 345817fd..2105120c 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/ItemDropdownEntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/ItemDropdownEntryFieldModel.swift
@@ -18,7 +18,8 @@
     public var options: [String] = []
     public var selectedIndex: Int = 0
 
-    public override func formFieldValue() -> AnyHashable? {        
+    public override func formFieldValue() -> AnyHashable? {
+        guard !options.isEmpty else { return nil }
         return options[selectedIndex]
     }