diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
index 5fe5c93f4199b4..b8c017c593ec77 100644
--- a/packages/block-library/src/image/image.js
+++ b/packages/block-library/src/image/image.js
@@ -547,6 +547,21 @@ export default function Image( {
 	const borderProps = useBorderProps( attributes );
 	const isRounded = attributes.className?.includes( 'is-style-rounded' );
 
+	const imgStyle = {
+		aspectRatio: aspectRatio ? aspectRatio : undefined,
+		objectFit: scale,
+		...borderProps.style,
+	};
+	if ( aspectRatio ) {
+		imgStyle.height = 'auto';
+		imgStyle.width = '100%';
+	}
+	if ( width ) {
+		imgStyle.width = width;
+	}
+	if ( height ) {
+		imgStyle.height = height;
+	}
 	let img = (
 		// Disable reason: Image itself is not meant to be interactive, but
 		// should direct focus to block.
@@ -564,14 +579,7 @@ export default function Image( {
 				} }
 				ref={ imageRef }
 				className={ borderProps.className }
-				style={ {
-					width:
-						( width && height ) || aspectRatio ? '100%' : undefined,
-					height:
-						( width && height ) || aspectRatio ? '100%' : undefined,
-					objectFit: scale,
-					...borderProps.style,
-				} }
+				style={ imgStyle }
 			/>
 			{ temporaryURL && <Spinner /> }
 		</>
@@ -689,8 +697,8 @@ export default function Image( {
 					onResizeStop();
 					setAttributes( {
 						width: elt.offsetWidth,
-						height: elt.offsetHeight,
-						aspectRatio: undefined,
+						height: 'auto',
+						aspectRatio: aspectRatio ? aspectRatio : undefined,
 					} );
 				} }
 				resizeRatio={ align === 'center' ? 2 : 1 }
diff --git a/packages/block-library/src/image/save.js b/packages/block-library/src/image/save.js
index 6fa8c6b2342f32..d8827e3347b328 100644
--- a/packages/block-library/src/image/save.js
+++ b/packages/block-library/src/image/save.js
@@ -49,20 +49,26 @@ export default function save( { attributes } ) {
 		[ `wp-image-${ id }` ]: !! id,
 	} );
 
+	const imgStyle = {
+		...borderProps.style,
+		aspectRatio,
+		objectFit: scale,
+	};
+	if ( width ) {
+		imgStyle.width = width;
+	}
+
+	if ( height && ! isNaN( height ) ) {
+		imgStyle.height = height;
+	}
 	const image = (
 		<img
 			src={ url }
 			alt={ alt }
 			className={ imageClasses || undefined }
-			style={ {
-				...borderProps.style,
-				aspectRatio,
-				objectFit: scale,
-				width,
-				height,
-			} }
+			style={ imgStyle }
 			width={ width }
-			height={ height }
+			height={ isNaN( height ) ? undefined : height }
 			title={ title }
 		/>
 	);