diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
index 510848b7..ca6111d3 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
@@ -957,6 +957,9 @@ class ComposeActivity : BaseActivity(),
                         is VideoSizeException -> {
                             R.string.error_video_upload_size
                         }
+                        is MediaSizeException -> {
+                            R.string.error_media_upload_size
+                        }
                         is VideoOrImageException -> {
                             R.string.error_media_upload_image_or_video
                         }
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt
index dd96d380..e07f2460 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt
@@ -64,6 +64,7 @@ interface MediaUploader {
 }
 
 class VideoSizeException : Exception()
+class MediaSizeException : Exception()
 class MediaTypeException : Exception()
 class CouldNotOpenFileException : Exception()
 
@@ -129,6 +130,9 @@ class MediaUploaderImpl(
                         PreparedMedia(QueuedMedia.Type.IMAGE, uri, mediaSize)
                     }
                     else -> {
+                        if (mediaSize > videoLimit) {
+                            throw MediaSizeException()
+                        }
                         PreparedMedia(QueuedMedia.Type.UNKNOWN, uri, mediaSize)
                         // throw MediaTypeException()
                     }
diff --git a/app/src/main/res/values/husky.xml b/app/src/main/res/values/husky.xml
index 4b206dbe..fb797892 100644
--- a/app/src/main/res/values/husky.xml
+++ b/app/src/main/res/values/husky.xml
@@ -9,5 +9,6 @@
     <string name="admin">Admin</string>
     <string name="moderator">Moderator</string>
 
+    <string name="error_media_upload_size">File size exceeds instance limits</string>
 </resources>