diff --git a/wp-admin/includes/class-wp-site-icon.php b/wp-admin/includes/class-wp-site-icon.php
index 42e2ca69a9..8c06db6459 100644
--- a/wp-admin/includes/class-wp-site-icon.php
+++ b/wp-admin/includes/class-wp-site-icon.php
@@ -229,10 +229,12 @@ class WP_Site_Icon {
 	 * @return array|null|string The attachment metadata value, array of values, or null.
 	 */
 	public function get_post_metadata( $value, $post_id, $meta_key, $single ) {
-		$site_icon_id = get_option( 'site_icon' );
+		if ( $single && '_wp_attachment_backup_sizes' === $meta_key ) {
+			$site_icon_id = get_option( 'site_icon' );
 
-		if ( $post_id == $site_icon_id && '_wp_attachment_backup_sizes' == $meta_key && $single ) {
-			add_filter( 'intermediate_image_sizes', array( $this, 'intermediate_image_sizes' ) );
+			if ( $post_id == $site_icon_id ) {
+				add_filter( 'intermediate_image_sizes', array( $this, 'intermediate_image_sizes' ) );
+			}
 		}
 
 		return $value;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 261b352d36..d30c0e2b34 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35298';
+$wp_version = '4.4-alpha-35299';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.