diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index d48b232..ffd242a 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -1212,6 +1212,11 @@ function template_preprocess_file_managed_file(&$variables) {
   if (!empty($element['#attributes']['class'])) {
     $variables['attributes']['class'] = (array) $element['#attributes']['class'];
   }
+
+  // Fix for unnecessary double errors on file upload.
+  // If this is removed, it will be a bad UX hit.
+  unset($variables['element']['#prefix']);
+  unset($variables['element']['#suffix']);
 }
 
 /**