diff --git a/Locale/jpn/LC_MESSAGES/files.po b/Locale/jpn/LC_MESSAGES/files.po
index fc22cee..7aaba97 100644
--- a/Locale/jpn/LC_MESSAGES/files.po
+++ b/Locale/jpn/LC_MESSAGES/files.po
@@ -33,6 +33,9 @@ msgstr "アップロード不可のファイル形式です"
 msgid "Failed uploading file."
 msgstr "アップロードに失敗したため、処理を中断しました。"
 
+msgid "Upload failed. File may be larger than %s."
+msgstr "アップロードに失敗しました。ファイルが%sを超えている可能性があります。アップロードするファイルを確認して再度お試しください。"
+
 #: Files/Model/Behavior/UploadFileValidateBehavior.php:110
 msgid "Total file size uploaded to the %s, exceeded the limit. The limit is %s(%s left)."
 msgstr "%sにアップロードしたファイルサイズの合計が大きすぎます。合計%s(残り:%s)までしか使用できません。"
diff --git a/Model/Behavior/AttachmentBehavior.php b/Model/Behavior/AttachmentBehavior.php
index fd3ce2a..9d0820c 100644
--- a/Model/Behavior/AttachmentBehavior.php
+++ b/Model/Behavior/AttachmentBehavior.php
@@ -123,8 +123,11 @@ public function beforeValidate(Model $model, $options = array()) {
 					if (isset($fileData['error']) &&
 						$fileData['error'] !== UPLOAD_ERR_OK &&
 						$fileData['error'] !== UPLOAD_ERR_NO_FILE) {
-						$model->validationErrors[$fieldName][] =
-							__d('files', 'Failed uploading file.');
+						$model->validationErrors[$fieldName][] = __d(
+							'files',
+							'Upload failed. File may be larger than %s.',
+							ini_get('upload_max_filesize') . 'B'
+						);
 					}
 				}
 			}
diff --git a/Model/Behavior/UploadFileValidateBehavior.php b/Model/Behavior/UploadFileValidateBehavior.php
index e349207..1259a70 100644
--- a/Model/Behavior/UploadFileValidateBehavior.php
+++ b/Model/Behavior/UploadFileValidateBehavior.php
@@ -58,7 +58,7 @@ public function getTotalSizeByRoomId(Model $model, $roomId) {
 					(`UploadFilesContent`.`content_is_active` IN (1, NULL))
 					OR
 					(`UploadFilesContent`.`content_is_latest` IN (1, NULL))
-					) AND `UploadFile`.`room_id` = ?
+					)
 				GROUP BY `UploadFile`.`id`
 			) AS UploadFileSize;
 EOF;
@@ -66,7 +66,7 @@ public function getTotalSizeByRoomId(Model $model, $roomId) {
 		$query = sprintf($query,
 			$model->tablePrefix . 'upload_files_contents',
 			$model->tablePrefix . 'upload_files');
-		$result = $model->query($query, [$roomId]);
+		$result = $model->query($query);
 		$total = $result[0][0]['total_size'];
 		$total = (is_null($total)) ? 0 : $total;
 		return $total;
diff --git a/Model/UploadFile.php b/Model/UploadFile.php
index 3085522..d8e2798 100644
--- a/Model/UploadFile.php
+++ b/Model/UploadFile.php
@@ -374,7 +374,11 @@ public function countUp($data) {
 		if ($result === false) {
 			throw new InternalErrorException('Failed UploadFile::countUp()');
 		}
+
+		$this->invalidateCDN = false;
 		$this->commit();
+		$this->invalidateCDN = true;
+
 		return $result;
 	}