diff --git a/src/dom_components/model/Components.js b/src/dom_components/model/Components.js
index 7da8d8418..56e2707fb 100644
--- a/src/dom_components/model/Components.js
+++ b/src/dom_components/model/Components.js
@@ -61,12 +61,13 @@ define([ 'backbone', 'require'],
 				if(!_.isEmpty(style) && this.editor){
 					var cssC = this.editor.get('CssComposer');
 					var newClass = this.editor.get('ClassManager').addClass(model.cid);
-					model.set({attributes: {}, style:{}});
+					model.set({style:{}});
 					model.get('classes').add(newClass);
 					var rule = cssC.newRule(newClass);
 					cssC.addRule(rule);
 					rule.set('style', style);
 				}
+				console.log('After component add');
       },
 
 		});
diff --git a/src/dom_components/view/ComponentImageView.js b/src/dom_components/view/ComponentImageView.js
index 8f3f562c1..ad85181fe 100644
--- a/src/dom_components/view/ComponentImageView.js
+++ b/src/dom_components/view/ComponentImageView.js
@@ -16,9 +16,6 @@ define(['backbone', './ComponentView'],
 			var compCls = this.config.imageCompClass || '';
 			this.classEmpty = this.pfx + 'image-placeholder' + (compCls ? ' ' + compCls : '');
 
-			if(!this.model.get('src'))
-				this.$el.attr('class', this.classEmpty);
-
 			if(this.config.modal)
 				this.modal = this.config.modal;
 
@@ -56,6 +53,10 @@ define(['backbone', './ComponentView'],
 		render: function() {
 			this.updateAttributes();
 			this.updateClasses();
+
+			if(!this.model.get('src'))
+				this.$el.attr('class', this.classEmpty);
+
 			return this;
 		},
 	});