diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index a6fc3f6ebe..508fa6902d 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -870,9 +870,12 @@ function file_save_upload($form_field_name, $validators = [], $destination = FAL
       ];
       // @todo Add support for render arrays in drupal_set_message()? See
       //  https://www.drupal.org/node/2505497.
+      drupal_get_messages();
       drupal_set_message(\Drupal::service('renderer')->renderPlain($message), 'error');
       $files[$i] = FALSE;
       continue;
+    } else {
+      drupal_get_messages();
     }
 
     // Move uploaded files from PHP's upload_tmp_dir to Drupal's temporary