diff --git a/composer/schema/instance.py b/composer/schema/instance.py index 036c7d0..5a4236d 100644 --- a/composer/schema/instance.py +++ b/composer/schema/instance.py @@ -53,7 +53,9 @@ class Instance(BaseInstance): fi = f.getFieldInstance(self, context=kw.get('context'), request=kw.get('request')) name = f.name - value = getattr(self.context, name) or fi.default + value = getattr(self.context, name, None) + if value is None: + value = fi.default if mode in ('view', 'preview'): value = fi.display(value) else: