diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index 28041c87fa..774b359dee 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -374,6 +374,7 @@ class fileupload
 			return $file;
 		}
 			
+		// Error array filled?
 		if (isset($_FILES[$form_name]['error']))
 		{
 			$error = $this->assign_internal_error($_FILES[$form_name]['error']);
@@ -385,6 +386,13 @@ class fileupload
 			}
 		}
 
+		// Check if empty file got uploaded (not catched by is_uploaded_file)
+		if (isset($_FILES[$form_name]['size']) && $_FILES[$form_name]['size'] == 0)
+		{
+			$file->error[] = $user->lang[$this->error_prefix . 'EMPTY_FILEUPLOAD'];
+			return $file;
+		}
+
 		// PHP Upload filesize exceeded
 		if ($file->get('filename') == 'none')
 		{