diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/DragUploader.js b/typo3/sysext/backend/Resources/Public/JavaScript/DragUploader.js
index d63c285c5553ecdf2a702585dfa6d02f5166fd15..6f48c47b3f89ec05199c86eb46d9026601aed7bc 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/DragUploader.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/DragUploader.js
@@ -542,7 +542,7 @@ define(['jquery',
 		me.$iconCol.html('<span class="t3-icon t3-icon-mimetypes t3-icon-other-other">&nbsp;</span>')
 
 		// check file size
-		if (me.file.size > me.dragUploader.maxFileSize) {
+		if (me.dragUploader.maxFileSize > 0 && me.file.size > me.dragUploader.maxFileSize) {
 			me.updateMessage(TYPO3.lang['file_upload.maxFileSizeExceeded']
 				.replace(/\{0\}/g, me.file.name)
 				.replace(/\{1\}/g, DragUploader.fileSizeAsString(me.dragUploader.maxFileSize)));
diff --git a/typo3/sysext/core/Classes/Resource/ResourceStorage.php b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
index 3a5388915565fd3fce28cd282efe8c1f4f643303..208bc49b1391809591a870defef622e68281902f 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceStorage.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
@@ -938,7 +938,7 @@ class ResourceStorage implements ResourceStorageInterface
         }
         // Max upload size (kb) for files.
         $maxUploadFileSize = GeneralUtility::getMaxUploadFileSize() * 1024;
-        if ($uploadedFileSize >= $maxUploadFileSize) {
+        if ($maxUploadFileSize > 0 && $uploadedFileSize >= $maxUploadFileSize) {
             unlink($localFilePath);
             throw new Exception\UploadSizeException('The uploaded file exceeds the size-limit of ' . $maxUploadFileSize . ' bytes', 1322110041);
         }