diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm
index 73c93ee4..f9af0250 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm
@@ -425,5 +425,5 @@ tabState settings allNames model =
     in
     FTabState.tabState settings
         openTabs
-        model.customFieldsModel
+        Nothing
         (.title >> ToggleAkkordionTab)
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/FieldTabState.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/FieldTabState.elm
index e12abb06..8952f2b5 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/FieldTabState.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/FieldTabState.elm
@@ -10,7 +10,7 @@ import Set exposing (Set)
 tabState :
     UiSettings
     -> Set String
-    -> Comp.CustomFieldMultiInput.Model
+    -> Maybe Comp.CustomFieldMultiInput.Model
     -> (TB.Tab msg -> msg)
     -> TB.Tab msg
     -> ( TB.State, msg )
@@ -35,7 +35,9 @@ tabState settings openTabs cfmodel toggle tab =
 
                 "Custom Fields" ->
                     isHidden Data.Fields.CustomFields
-                        || Comp.CustomFieldMultiInput.isEmpty cfmodel
+                        || (Maybe.map Comp.CustomFieldMultiInput.isEmpty cfmodel
+                                |> Maybe.withDefault False
+                           )
 
                 "Date" ->
                     isHidden Data.Fields.Date
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm
index 305e5df4..20fdde6f 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm
@@ -1149,7 +1149,7 @@ tabState : UiSettings -> Model -> TB.Tab Msg -> ( TB.State, Msg )
 tabState settings model tab =
     FTabState.tabState settings
         model.openTabs
-        model.customFieldModel
+        (Just model.customFieldModel)
         (.title >> ToggleAkkordionTab)
         tab