diff --git a/src/plugins/cppeditor/cppcodemodelsettings.cpp b/src/plugins/cppeditor/cppcodemodelsettings.cpp
index 6e53c0bbc13..b7af1bbb7af 100644
--- a/src/plugins/cppeditor/cppcodemodelsettings.cpp
+++ b/src/plugins/cppeditor/cppcodemodelsettings.cpp
@@ -36,6 +36,7 @@
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
+#include <utils/settingsutils.h>
 
 #include <QDateTime>
 #include <QHash>
@@ -399,12 +400,12 @@ QVersionNumber ClangdSettings::clangdVersion(const FilePath &clangdFilePath)
 
 void ClangdSettings::loadSettings()
 {
-    m_data.fromMap(Core::ICore::settings()->value(clangdSettingsKey()).toMap());
+    Utils::toSettings(clangdSettingsKey(), {}, Core::ICore::settings(), &m_data);
 }
 
 void ClangdSettings::saveSettings()
 {
-    Core::ICore::settings()->setValue(clangdSettingsKey(), m_data.toMap());
+    Utils::fromSettings(clangdSettingsKey(), {}, Core::ICore::settings(), &m_data);
 }
 
 #ifdef WITH_TESTS