diff --git a/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm b/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm
index 6f6b601b..041fd730 100644
--- a/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm
+++ b/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm
@@ -53,12 +53,20 @@ update flags settings msg model =
     case msg of
         UiSettingsFormMsg lm ->
             let
+                inSettings =
+                    Maybe.withDefault settings model.settings
+
                 ( m_, sett ) =
-                    Comp.UiSettingsForm.update settings lm model.formModel
+                    Comp.UiSettingsForm.update inSettings lm model.formModel
             in
             ( { model
                 | formModel = m_
-                , settings = sett
+                , settings =
+                    if sett == Nothing then
+                        model.settings
+
+                    else
+                        sett
                 , message =
                     if sett /= Nothing then
                         Nothing