diff --git a/src/wp-includes/js/customize-models.js b/src/wp-includes/js/customize-models.js
index 5fa62aeecc..5969be3963 100644
--- a/src/wp-includes/js/customize-models.js
+++ b/src/wp-includes/js/customize-models.js
@@ -113,6 +113,10 @@
 				return false;
 			}
 
+			if (this.get('imageWidth') <= this.get('themeWidth')) {
+				return false;
+			}
+
 			return true;
 		}
 	});
diff --git a/tests/qunit/wp-admin/js/customize-header.js b/tests/qunit/wp-admin/js/customize-header.js
index ba2895f47e..056e763d31 100644
--- a/tests/qunit/wp-admin/js/customize-header.js
+++ b/tests/qunit/wp-admin/js/customize-header.js
@@ -103,6 +103,29 @@ jQuery( function() {
 			imageWidth: 10000,
 			imageHeight: 8600
 		});
+
+		equal(this.model.shouldBeCropped(), false);
+	});
+
+	test('should not be cropped when the image width is smaller or equal as theme width', function() {
+		this.model.set({
+			themeFlexWidth: false,
+			themeFlexHeight: false,
+			imageWidth: 1000,
+			imageHeight: 100
+		});
+
+		equal(this.model.shouldBeCropped(), false);
+	});
+
+	test('should not be cropped when the image width is smaller or equal as theme width, theme supports flex height and width', function() {
+		this.model.set({
+			themeFlexWidth: true,
+			themeFlexHeight: true,
+			imageWidth: 900,
+			imageHeight: 100
+		});
+
 		equal(this.model.shouldBeCropped(), false);
 	});
 });