diff --git a/kmail-refresh-settings/refreshsettingscleanuppage.cpp b/kmail-refresh-settings/refreshsettingscleanuppage.cpp
index e4042d89d..5efc3ad2e 100644
--- a/kmail-refresh-settings/refreshsettingscleanuppage.cpp
+++ b/kmail-refresh-settings/refreshsettingscleanuppage.cpp
@@ -98,6 +98,9 @@ void RefreshSettingsCleanupPage::initCleanupFolderSettings(const QString &config
     for (const QString &str : folderList) {
         KConfigGroup oldGroup = settingsrc->group(str);
         cleanupFolderSettings(oldGroup);
+        if (oldGroup.keyList().isEmpty()) {
+            oldGroup.deleteGroup();
+        }
     }
     settingsrc->sync();
     Q_EMIT cleanDoneInfo(i18n("Clean Folder Settings in setting file `%1`: Done", configName));