diff --git a/platform/platform-api/src/com/intellij/util/text/DateTimeFormatManager.java b/platform/platform-api/src/com/intellij/util/text/DateTimeFormatManager.java
index 42d5ecf1ba66..57a50632938e 100644
--- a/platform/platform-api/src/com/intellij/util/text/DateTimeFormatManager.java
+++ b/platform/platform-api/src/com/intellij/util/text/DateTimeFormatManager.java
@@ -1,17 +1,14 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.text;
 
-import com.intellij.configurationStore.XmlSerializer;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.SettingsCategory;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.util.xmlb.XmlSerializerUtil;
-import org.jdom.Element;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -19,7 +16,7 @@ import java.time.format.DateTimeFormatter;
 
 @ApiStatus.Internal
 @State(name = "DateTimeFormatter", storages = @Storage("ui-datetime.xml"), category = SettingsCategory.SYSTEM)
-public final class DateTimeFormatManager implements PersistentStateComponent<Element> {
+public final class DateTimeFormatManager implements PersistentStateComponent<DateTimeFormatManager> {
   private static final String DEFAULT_DATE_FORMAT = "dd MMM yyyy";
 
   private boolean myOverrideSystemDateFormat = false;
@@ -28,14 +25,13 @@ public final class DateTimeFormatManager implements PersistentStateComponent<Ele
   private boolean myPrettyFormattingAllowed = true;
 
   @Override
-  public @Nullable Element getState() {
-    return XmlSerializer.serialize(this);
+  public DateTimeFormatManager getState() {
+    return this;
   }
 
   @Override
-  public void loadState(@NotNull Element state) {
-    var loaded = XmlSerializer.deserialize(state, DateTimeFormatManager.class);
-    XmlSerializerUtil.copyBean(loaded, this);
+  public void loadState(@NotNull DateTimeFormatManager state) {
+    XmlSerializerUtil.copyBean(state, this);
     resetFormats();
   }
 
diff --git a/platform/platform-impl/resources/settings/ide-settings-model.json b/platform/platform-impl/resources/settings/ide-settings-model.json
index 28cc6b429303..b4247c771111 100644
--- a/platform/platform-impl/resources/settings/ide-settings-model.json
+++ b/platform/platform-impl/resources/settings/ide-settings-model.json
@@ -7719,7 +7719,29 @@
       "scope": "app",
       "pluginId": "com.intellij",
       "classFqn": "com.intellij.util.text.DateTimeFormatManager",
-      "storage": "ui-datetime.xml"
+      "storage": "ui-datetime.xml",
+      "properties": [
+        {
+          "name": "dateFormatPattern",
+          "type": "String",
+          "javaType": "java.lang.String"
+        },
+        {
+          "name": "overrideSystemDateFormat",
+          "type": "Boolean",
+          "javaType": "boolean"
+        },
+        {
+          "name": "prettyFormattingAllowed",
+          "type": "Boolean",
+          "javaType": "boolean"
+        },
+        {
+          "name": "use24HourTime",
+          "type": "Boolean",
+          "javaType": "boolean"
+        }
+      ]
     },
     {
       "name": "Vcs.Log.Big.Repositories",
diff --git a/platform/platform-impl/resources/settings/ide-settings-whitelist.json b/platform/platform-impl/resources/settings/ide-settings-whitelist.json
index 07ac33d1376f..c1fd52fadab6 100644
--- a/platform/platform-impl/resources/settings/ide-settings-whitelist.json
+++ b/platform/platform-impl/resources/settings/ide-settings-whitelist.json
@@ -75,6 +75,7 @@
     "com.intellij.database:app:SqlFoldingSettings.*",
     "com.intellij:app:BaseRefactoringSettings.*",
     "com.intellij:app:ConsoleFoldingSettings.*",
+    "com.intellij:app:DateTimeFormatter.*",
     "com.intellij:app:EditorSettings.custom_soft_wrap_indent",
     "com.intellij:app:EditorSettings.insert_parentheses_automatically",
     "com.intellij:app:EditorSettings.is_ensure_newline_at_eof",