diff --git a/client/core/src/components/textfield/textfield.js b/client/core/src/components/textfield/textfield.js
index 4747ba39f..83be9f400 100644
--- a/client/core/src/components/textfield/textfield.js
+++ b/client/core/src/components/textfield/textfield.js
@@ -36,7 +36,7 @@ export default class Textfield extends Input {
     set value(value) {
         this._value = (value === undefined || value === '') ? null : value;
         this.input.value = this._value;
-        this.hasValue = Boolean(this._value);
+        this.hasValue = this._value !== null;
         if (this.hasValue) this.element.classList.add('not-empty');
         else this.element.classList.remove('not-empty');
         this.mdlUpdate();