diff --git a/sao/src/view/form.js b/sao/src/view/form.js
index 9f10cf5b5b..b5c01b91cb 100644
--- a/sao/src/view/form.js
+++ b/sao/src/view/form.js
@@ -5775,8 +5775,7 @@ function eval_pyson(value){
             return this._parse(this.format, this.input.val());
         },
         set_value: function(value) {
-            if ((value instanceof Sao.DateTime) ||
-                (value instanceof Sao.Date)) {
+            if (value && (value.isDate || value.isDateTime)) {
                 value = this._format(this.format, value);
             } else {
                 value = '';