diff --git a/src/main/java/org/olat/core/configuration/PersistedProperties.java b/src/main/java/org/olat/core/configuration/PersistedProperties.java
index baf51868fd6a95980c0cdb289ad4769fe3547ed9..171d78dbdb10616314c949c577be4acbd38aacd6 100644
--- a/src/main/java/org/olat/core/configuration/PersistedProperties.java
+++ b/src/main/java/org/olat/core/configuration/PersistedProperties.java
@@ -366,7 +366,11 @@ public class PersistedProperties extends LogDelegator implements Initializable,
 		synchronized (configuredProperties) { // make read/write save in VM
 			String oldValue = configuredProperties.getProperty(propertyName);
 			if (oldValue == null || !oldValue.equals(value)) {
-				configuredProperties.setProperty(propertyName, value);
+				if(value == null) {
+					configuredProperties.remove(propertyName);
+				} else {
+					configuredProperties.setProperty(propertyName, value);
+				}
 				propertiesDirty = true;
 				if (saveConfiguration) savePropertiesAndFireChangedEvent();
 			}