diff --git a/src/shapes/image.class.js b/src/shapes/image.class.js
index 89e09a22..c61d0d7a 100644
--- a/src/shapes/image.class.js
+++ b/src/shapes/image.class.js
@@ -374,7 +374,7 @@
       options || (options = { });
       this.setOptions(options);
       this._setWidthHeight(options);
-      if (this._element) {
+      if (this._element && this.crossOrigin) {
         this._element.crossOrigin = this.crossOrigin;
       }
     },
diff --git a/test/unit/image.js b/test/unit/image.js
index bc412498..24134a58 100644
--- a/test/unit/image.js
+++ b/test/unit/image.js
@@ -161,14 +161,16 @@
       equal(objRepr.crossOrigin, '', 'toObject should return proper crossOrigin value');
 
       var elImage2 = _createImageElement();
+	  elImage2.crossOrigin = 'anonymous';
       image.setElement(elImage2);
-      equal(elImage2.crossOrigin, '', 'setElement should set proper crossOrigin on an img element');
+      equal(elImage2.crossOrigin, 'anonymous', 'setElement should set proper crossOrigin on an img element');
 
       // fromObject doesn't work on Node :/
       if (fabric.isLikelyNode) {
         start();
         return;
       }
+	  
       fabric.Image.fromObject(objRepr, function(img) {
         equal(img.crossOrigin, '');
         start();