diff --git a/src/case/editor/editor.state.js b/src/case/editor/editor.state.js
index 7b388da4a..d1e11b20a 100644
--- a/src/case/editor/editor.state.js
+++ b/src/case/editor/editor.state.js
@@ -156,8 +156,6 @@ BI.StateEditor = BI.inherit(BI.Widget, {
 
     setWaterMark: function (v) {
         this.options.watermark = v;
-        this.options.defaultText = v;
-        this.setState(BI.isNull(this.stateValue) || this.stateValue === "" ? v : this.stateValue);
         this.editor.setWaterMark(v);
     },
 
diff --git a/src/case/editor/editor.state.simple.js b/src/case/editor/editor.state.simple.js
index e2c010990..81b815441 100644
--- a/src/case/editor/editor.state.simple.js
+++ b/src/case/editor/editor.state.simple.js
@@ -143,8 +143,6 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
 
     setWaterMark: function (v) {
         this.options.watermark = v;
-        this.options.text = v;
-        this.setState(this.stateValue);
         this.editor.setWaterMark(v);
     },
 
@@ -234,7 +232,6 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
     setState: function (v) {
         var o = this.options;
         BI.SimpleStateEditor.superclass.setValue.apply(this, arguments);
-        this.stateValue = v;
         if (BI.isNumber(v)) {
             if (v === BI.Selection.All) {
                 this._setText(BI.i18nText("BI-Already_Selected"));