diff --git a/core/modules/file/src/Upload/FileFieldUploadHandler.php b/core/modules/file/src/Upload/FileFieldUploadHandler.php
index 79ee90c812..669f73839d 100644
--- a/core/modules/file/src/Upload/FileFieldUploadHandler.php
+++ b/core/modules/file/src/Upload/FileFieldUploadHandler.php
@@ -153,10 +153,9 @@ protected function getUploadValidators(FieldDefinitionInterface $field_definitio
     // There is always a file size limit due to the PHP server limit.
     $validators['file_validate_size'] = [$max_filesize];
 
-    // Add the extension check if necessary.
-    if (!empty($settings['file_extensions'])) {
-      $validators['file_validate_extensions'] = [$settings['file_extensions']];
-    }
+    // Add the extension check. The extension logic is handled later in
+    // FileUploadHander::handleExtensionValidation.
+    $validators['file_validate_extensions'] = empty($settings['file_extensions']) ? [] : [$settings['file_extensions']];
 
     return $validators;
   }