diff --git a/.gitignore b/.gitignore
index ecde199b..99c1c155 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@ out/
 /http-client.private.env.json
 /logs/
 /hideout-mastodon/logs/
+/hideout-mastodon/files/
diff --git a/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringMediaApi.kt b/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringMediaApi.kt
index d5bed541..a28dafbb 100644
--- a/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringMediaApi.kt
+++ b/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringMediaApi.kt
@@ -21,9 +21,12 @@ import dev.usbharu.hideout.core.application.media.UploadMediaApplicationService
 import dev.usbharu.hideout.core.infrastructure.springframework.oauth2.SpringSecurityOauth2PrincipalContextHolder
 import dev.usbharu.hideout.mastodon.interfaces.api.generated.MediaApi
 import dev.usbharu.hideout.mastodon.interfaces.api.generated.model.MediaAttachment
+import org.slf4j.LoggerFactory
+import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.stereotype.Controller
 import org.springframework.web.multipart.MultipartFile
+import org.springframework.web.server.ResponseStatusException
 import java.nio.file.Files
 
 @Controller
@@ -37,6 +40,13 @@ class SpringMediaApi(
         description: String?,
         focus: String?,
     ): ResponseEntity<MediaAttachment> {
+
+        if (file.size == 0L) {
+            logger.warn("File is empty.")
+            throw ResponseStatusException(HttpStatus.BAD_REQUEST, "File is empty.")
+        }
+
+
         val tempFile = Files.createTempFile("hideout-tmp-file", ".tmp")
 
         Files.newOutputStream(tempFile).use { outputStream ->
@@ -73,4 +83,8 @@ class SpringMediaApi(
             )
         )
     }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(SpringMediaApi::class.java)
+    }
 }
diff --git a/hideout-mastodon/src/test/kotlin/mastodon/media/MediaTest.kt b/hideout-mastodon/src/test/kotlin/mastodon/media/MediaTest.kt
index 13d2bd55..7e4755d9 100644
--- a/hideout-mastodon/src/test/kotlin/mastodon/media/MediaTest.kt
+++ b/hideout-mastodon/src/test/kotlin/mastodon/media/MediaTest.kt
@@ -40,7 +40,7 @@ import org.springframework.web.context.WebApplicationContext
 @SpringBootTest(classes = [SpringApplication::class])
 @AutoConfigureMockMvc
 @Transactional
-@Sql("/sql/actors.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS)
+@Sql("/sql/actors.sql","/sql/userdetail.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS)
 class MediaTest {
 
     @Autowired
diff --git a/hideout-core/src/test/resources/media/400x400.png b/hideout-mastodon/src/test/resources/media/400x400.png
similarity index 100%
rename from hideout-core/src/test/resources/media/400x400.png
rename to hideout-mastodon/src/test/resources/media/400x400.png