diff --git a/src/style_manager/view/PropertiesView.js b/src/style_manager/view/PropertiesView.js
index 039f164f7..d717a8a8c 100644
--- a/src/style_manager/view/PropertiesView.js
+++ b/src/style_manager/view/PropertiesView.js
@@ -15,7 +15,7 @@ module.exports = Backbone.View.extend({
     this.pfx = this.config.stylePrefix || '';
     this.target = o.target || {};
     this.propTarget = o.propTarget || {};
-    this.onChange = o.onChange || {};
+    this.onChange = o.onChange;
     this.onInputRender = o.onInputRender || {};
     this.customValue = o.customValue || {};
   },
diff --git a/src/style_manager/view/PropertyView.js b/src/style_manager/view/PropertyView.js
index 68c7b874e..ce433afea 100644
--- a/src/style_manager/view/PropertyView.js
+++ b/src/style_manager/view/PropertyView.js
@@ -40,7 +40,7 @@ module.exports = Backbone.View.extend({
     this.ppfx = this.config.pStylePrefix || '';
     this.target = o.target || {};
     this.propTarget = o.propTarget || {};
-    this.onChange = o.onChange || {};
+    this.onChange = o.onChange;
     this.onInputRender = o.onInputRender  || {};
     this.customValue  = o.customValue  || {};
     const model = this.model;
@@ -183,9 +183,9 @@ module.exports = Backbone.View.extend({
       status = '';
     }
 
-    // Maybe in some cases I should set here a value on the model (silently)
+    model.set('value', value, {silent: 1});
     this.setValue(value, 1);
-    this.model.set('status', status);
+    model.set('status', status);
 
     if (em) {
       em.trigger('styleManager:change', this);
@@ -298,16 +298,12 @@ module.exports = Backbone.View.extend({
     const onChange = this.onChange;
     this.setValue(value);
 
-    if (!target) {
-      return;
-    }
-
     // Check if component is allowed to be styled
-    if (!this.isTargetStylable() || !this.isComponentStylable()) {
+    if (!target || !this.isTargetStylable() || !this.isComponentStylable()) {
       return;
     }
 
-    if (onChange && typeof onChange === "function") {
+    if (onChange) {
       onChange(target, this, opt);
     } else {
       this.updateTargetStyle(value, null, opt);
@@ -382,9 +378,10 @@ module.exports = Backbone.View.extend({
   },
 
   /**
-   * Set value to the input
-   * @param   {String}  value
-   * @param   {Boolean}  force
+   * Set the value to property input
+   * @param {String} value
+   * @param {Boolean} force
+   * @private
    * */
   setValue(value, force) {
     const model = this.model;
@@ -398,8 +395,6 @@ module.exports = Backbone.View.extend({
 
     const input = this.$input;
     input && input.val(v);
-
-    //this.model.set({value: v}, {silent: true});
   },
 
   updateVisibility() {
diff --git a/test/specs/style_manager/model/Models.js b/test/specs/style_manager/model/Models.js
index b4cc8d534..766d77551 100644
--- a/test/specs/style_manager/model/Models.js
+++ b/test/specs/style_manager/model/Models.js
@@ -140,14 +140,6 @@ module.exports = {
         expect(obj.has('property')).toEqual(true);
       });
 
-      it('Has no properties', () => {
-        expect(obj.get('properties').length).toEqual(0);
-      });
-
-      it('Has no layers', () => {
-        expect(obj.get('layers').length).toEqual(0);
-      });
-
     });
 
     describe('Properties', () => {
diff --git a/test/specs/style_manager/view/PropertyView.js b/test/specs/style_manager/view/PropertyView.js
index 87443c36f..9c5f70001 100644
--- a/test/specs/style_manager/view/PropertyView.js
+++ b/test/specs/style_manager/view/PropertyView.js
@@ -75,12 +75,6 @@ module.exports = {
           expect(view.model.get('value')).toEqual(propValue);
         });
 
-        // Tests getValueForTarget()
-        it('Get value for target', () => {
-          view.model.set('value', propValue);
-          expect(view.getValueForTarget()).toEqual(propValue);
-        });
-
         // Tests valueChanged() -> ...
         it('Update input on value change', () => {
           view.model.set('value', propValue);