diff --git a/src/wp-includes/pluggable.php b/src/wp-includes/pluggable.php
index 7ed917001b..cf041fe7da 100644
--- a/src/wp-includes/pluggable.php
+++ b/src/wp-includes/pluggable.php
@@ -2867,22 +2867,26 @@ if ( ! function_exists( 'get_avatar' ) ) :
 			}
 		}
 
-		// Add `loading` attribute.
+		// Add `loading` and `decoding` attributes.
 		$extra_attr = $args['extra_attr'];
-		$loading    = $args['loading'];
 
-		if ( in_array( $loading, array( 'lazy', 'eager' ), true ) && ! preg_match( '/\bloading\s*=/', $extra_attr ) ) {
+		if ( in_array( $args['loading'], array( 'lazy', 'eager' ), true )
+			&& ! preg_match( '/\bloading\s*=/', $extra_attr )
+		) {
 			if ( ! empty( $extra_attr ) ) {
 				$extra_attr .= ' ';
 			}
 
-			$extra_attr .= "loading='{$loading}'";
+			$extra_attr .= "loading='{$args['loading']}'";
 		}
 
-		if ( in_array( $args['decoding'], array( 'async', 'sync', 'auto' ), true ) && ! preg_match( '/\bdecoding\s*=/', $extra_attr ) ) {
+		if ( in_array( $args['decoding'], array( 'async', 'sync', 'auto' ), true )
+			&& ! preg_match( '/\bdecoding\s*=/', $extra_attr )
+		) {
 			if ( ! empty( $extra_attr ) ) {
 				$extra_attr .= ' ';
 			}
+
 			$extra_attr .= "decoding='{$args['decoding']}'";
 		}