diff --git a/tools/chatgui/src/audiodevicesettingspage.cpp b/tools/chatgui/src/audiodevicesettingspage.cpp
index a147fc51..9abf0837 100644
--- a/tools/chatgui/src/audiodevicesettingspage.cpp
+++ b/tools/chatgui/src/audiodevicesettingspage.cpp
@@ -215,7 +215,7 @@ void AudioDeviceSettingsPage::applyAndSave() {
     /* also update [chat] config section + live apply for headless-compat settings */
     if (!m_configPath.isEmpty()) {
         auto postChat = [](const QString& path, const char* name, int val) {
-            config_update_option(path, "chat", name, QString::number(val), CONFIG_UPDATE_REPLACE);
+            config_update_option(path, "chatserver", name, QString::number(val), CONFIG_UPDATE_REPLACE);
             QByteArray v = QByteArray::number(val);
             size_t nlen = strlen(name), vlen = (size_t)v.size(), total = nlen + 1 + vlen + 1;
             if (total > 256) return;
diff --git a/tools/chatgui/src/invitedialog.cpp b/tools/chatgui/src/invitedialog.cpp
index a4bdef9a..71d36de5 100644
--- a/tools/chatgui/src/invitedialog.cpp
+++ b/tools/chatgui/src/invitedialog.cpp
@@ -6,6 +6,7 @@
 #include "../transport/gui_bridge.h"
 #include "../db/db_manager.h"
 extern "C" {
+#include "chat/chat_core.h"
 #include "chat/chat_sync.h"
 #include "transport_layer/secure_channel.h"
 }
diff --git a/tools/chatgui/src/storagesettingspage.cpp b/tools/chatgui/src/storagesettingspage.cpp
index 49aa23fb..23b5c68b 100644
--- a/tools/chatgui/src/storagesettingspage.cpp
+++ b/tools/chatgui/src/storagesettingspage.cpp
@@ -23,10 +23,8 @@ static void saveUiStateInt(const char* key, int val) {
     gui_bridge_post_uasync_fn(chat_core_save_ui_state_trampoline, arg);
 }
 
-static void postChatSetting(const QString& configPath, const char* name, int val) {
-    /* persist to config file */
-    config_update_option(configPath, "chat", name, QString::number(val), CONFIG_UPDATE_REPLACE);
-    /* apply on-the-fly via bridge */
+void postChatSetting(const QString& configPath, const char* name, int val) {
+    config_update_option(configPath, "chatserver", name, QString::number(val), CONFIG_UPDATE_REPLACE);
     QByteArray v = QByteArray::number(val);
     size_t nlen = strlen(name), vlen = (size_t)v.size(), total = nlen + 1 + vlen + 1;
     if (total > 256) return;
diff --git a/tools/chatgui/src/storagesettingspage.h b/tools/chatgui/src/storagesettingspage.h
index 28924908..fc07d81f 100644
--- a/tools/chatgui/src/storagesettingspage.h
+++ b/tools/chatgui/src/storagesettingspage.h
@@ -6,6 +6,8 @@ class DbManager;
 class QCheckBox;
 class QSpinBox;
 
+void postChatSetting(const QString& configPath, const char* name, int val);
+
 class StorageSettingsPage : public QWidget {
     Q_OBJECT
 public: