diff --git a/src/block-components/image/edit.js b/src/block-components/image/edit.js
index 2277968427..635b34db6e 100644
--- a/src/block-components/image/edit.js
+++ b/src/block-components/image/edit.js
@@ -175,7 +175,7 @@ const Controls = props => {
 							newAttributes.imageWidth = ''
 							newAttributes.imageWidthUnit = '%'
 							// We need the width of the image block to compare
-							if ( width < imageBlockWidth ) {
+							if ( width && width < imageBlockWidth ) {
 								newAttributes.imageWidth = width
 								newAttributes.imageWidthUnit = 'px'
 							}