diff --git a/radicale/storage/database.py b/radicale/storage/database.py
index 6a2c1ad..dd2317e 100644
--- a/radicale/storage/database.py
+++ b/radicale/storage/database.py
@@ -243,14 +243,12 @@ class Collection(ical.Collection):
         old_properties = properties.copy()
         yield properties
         # On exit
-        if self._db_collection and old_properties != properties:
+        if old_properties != properties:
             for prop in db_properties:
                 self.session.delete(prop)
             for name, value in properties.items():
-                prop = DBProperty()
-                prop.name = name
-                prop.value = value
-                prop.collection_path = self.path
+                prop = DBProperty(name=name, value=value or '',
+                                  collection_path=self.path)
                 self.session.add(prop)
 
     @property