diff --git a/packages/block-library/src/image/index.php b/packages/block-library/src/image/index.php
index 8e7b422496b4c1..28232002514551 100644
--- a/packages/block-library/src/image/index.php
+++ b/packages/block-library/src/image/index.php
@@ -220,8 +220,6 @@ function block_core_image_render_lightbox( $block_content, $block ) {
 			JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP
 		)
 	);
-	$p->set_attribute( 'data-wp-class--hide-content', 'state.isContentHidden' );
-	$p->set_attribute( 'data-wp-class--show-content', 'state.isContentVisible' );
 
 	// Image.
 	$p->next_tag( 'img' );
@@ -232,6 +230,8 @@ function block_core_image_render_lightbox( $block_content, $block ) {
 	// contain a caption, and we don't want to trigger the lightbox when the
 	// caption is clicked.
 	$p->set_attribute( 'data-wp-on-async--click', 'actions.showLightbox' );
+	$p->set_attribute( 'data-wp-class--hide', 'state.isContentHidden' );
+	$p->set_attribute( 'data-wp-class--show', 'state.isContentVisible' );
 
 	$body_content = $p->get_updated_html();
 
diff --git a/packages/block-library/src/image/style.scss b/packages/block-library/src/image/style.scss
index 8560df8f083500..1bb19bf29da691 100644
--- a/packages/block-library/src/image/style.scss
+++ b/packages/block-library/src/image/style.scss
@@ -9,29 +9,15 @@
 		max-width: 100%;
 		vertical-align: bottom;
 		box-sizing: border-box;
-	}
 
-	@media (prefers-reduced-motion: no-preference) {
-		&.hide-content {
-			img {
+		@media (prefers-reduced-motion: no-preference) {
+			&.hide {
 				visibility: hidden;
 			}
-			figcaption {
-				.wp-block-gallery & {
-					visibility: hidden;
-				}
-			}
-		}
 
-		&.show-content {
-			img {
+			&.show {
 				animation: show-content-image 0.4s;
 			}
-			figcaption {
-				.wp-block-gallery & {
-					animation: show-content-image 0.4s;
-				}
-			}
 		}
 	}