diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
index 12b830ce2cfee8e5229b8acb9397b75fba1cb5c5..964f218b0b7773c6c67e41179635aa95456da64f 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
@@ -660,7 +660,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
             for (String propName : prefStore.preferenceNames()) {
                 String propValue = prefStore.getString(propName);
                 String defValue = prefStore.getDefaultString(propName);
-                if (propValue == null) {
+                if (propValue == null || CommonUtils.equalObjects(propValue, defValue)) {
                     continue;
                 }
                 xml.startElement(RegistryConstants.TAG_CUSTOM_PROPERTY);