diff --git a/core/modules/field/field.install b/core/modules/field/field.install
index 40260b8..b7bdc5b 100644
--- a/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -398,6 +398,14 @@ function field_update_8002() {
     else {
       $deleted_instances[$instance['id']] = $instance;
     }
+
+    // Update file_usage table in case this instance has a default image.
+    if (!empty($instance['settings']['default_image'])) {
+      db_update('file_usage')
+        ->fields(array('id' => $instance['field_id']))
+        ->condition('fid', $instance['settings']['default_image'])
+        ->execute();
+    }
   }
 
   // Create the manifest files.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPictureUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPictureUpgradePathTest.php
index 04070c9..279d7cf 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPictureUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPictureUpgradePathTest.php
@@ -51,7 +51,7 @@ public function testUserPictureUpgrade() {
     // Check file usage for the default image.
     $usage = file_usage()->listUsage($file);
     $field = field_info_field('user_picture');
-    $this->assertEqual(1, $usage['image']['default_image'][$field['id']]);
+    $this->assertTrue(isset($usage['image']['default_image'][$field['id']]));
 
     $this->assertEqual($instance['settings']['max_resolution'], '800x800', 'User picture maximum resolution has been migrated.');
     $this->assertEqual($instance['settings']['max_filesize'], '700 KB', 'User picture maximum filesize has been migrated.');