diff --git a/trunk/daemon/core/conf.py b/trunk/daemon/core/conf.py
index b7b38451..d320fa57 100644
--- a/trunk/daemon/core/conf.py
+++ b/trunk/daemon/core/conf.py
@@ -76,6 +76,8 @@ class ConfigurableManager(object):
             try:
                 # key=value
                 (key, value) = kv.split('=', 1)
+                if value is not None and value.is_empty():
+                    value = None
             except ValueError:
                 # value only
                 key = keys[kvs.index(kv)]