diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiImageView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiImageView.java
index 3158e45903b..4ac99861a32 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiImageView.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiImageView.java
@@ -47,7 +47,6 @@ public class TiImageView extends ViewGroup implements Handler.Callback, OnClickL
 
 	private OnClickListener clickListener;
 
-	private boolean enableScale;
 	private boolean enableZoomControls;
 
 	private boolean isImageRippleEnabled;
@@ -99,7 +98,6 @@ public TiImageView(Context context)
 		imageView.setAdjustViewBounds(true);
 		imageView.setScaleType(ScaleType.MATRIX);
 		addView(imageView);
-		setEnableScale(true);
 
 		gestureDetector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() {
 			@Override
@@ -172,12 +170,6 @@ public TiImageView(Context context, TiViewProxy proxy)
 		this.proxy = new WeakReference<>(proxy);
 	}
 
-	public void setEnableScale(boolean enableScale)
-	{
-		this.enableScale = enableScale;
-		requestLayout();
-	}
-
 	public void setEnableZoomControls(boolean enableZoomControls)
 	{
 		this.enableZoomControls = enableZoomControls;
@@ -407,7 +399,7 @@ private void computeBaseMatrix()
 		// Apply "scalingMode" to image.
 		int scalingMode = this.scalingMode;
 		if (scalingMode == MediaModule.IMAGE_SCALING_AUTO) {
-			if (!this.enableZoomControls && !this.enableScale && this.viewWidthDefined && this.viewHeightDefined) {
+			if (this.viewWidthDefined && this.viewHeightDefined) {
 				scalingMode = MediaModule.IMAGE_SCALING_FILL;
 			} else {
 				scalingMode = MediaModule.IMAGE_SCALING_ASPECT_FIT;
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIImageView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIImageView.java
index f6c92e87331..587de44f9ab 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIImageView.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIImageView.java
@@ -32,7 +32,6 @@
 import ti.modules.titanium.filesystem.FileProxy;
 import ti.modules.titanium.media.MediaModule;
 import ti.modules.titanium.ui.ImageViewProxy;
-import ti.modules.titanium.ui.ScrollViewProxy;
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.os.Handler;
@@ -777,12 +776,6 @@ public void processProperties(KrollDict d)
 			setTintColor(d.getString("tintColor"));
 		}
 
-		// If height and width is not defined, disable scaling for scrollview since an image
-		// can extend beyond the screensize in scrollview.
-		if (proxy.getParent() instanceof ScrollViewProxy && !heightDefined && !widthDefined) {
-			view.setEnableScale(false);
-		}
-
 		super.processProperties(d);
 	}