diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt
index b38c72f73..4533f58ec 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt
@@ -171,22 +171,26 @@ open class NewMediaModel : ViewModel() {
                     }
 
                 val imageJobs =
-                    listOf(
-                        viewModelScope.launch(Dispatchers.IO) {
-                            withTimeoutOrNull(30000) {
-                                suspendCancellableCoroutine { continuation ->
-                                    account?.sendAllAsOnePictureEvent(
-                                        imageUrls,
-                                        caption,
-                                        sensitiveContent,
-                                        relayList,
-                                    ) {
-                                        continuation.resume(true)
+                    if (imageUrls.isNotEmpty()) {
+                        listOf(
+                            viewModelScope.launch(Dispatchers.IO) {
+                                withTimeoutOrNull(30000) {
+                                    suspendCancellableCoroutine { continuation ->
+                                        account?.sendAllAsOnePictureEvent(
+                                            imageUrls,
+                                            caption,
+                                            sensitiveContent,
+                                            relayList,
+                                        ) {
+                                            continuation.resume(true)
+                                        }
                                     }
                                 }
-                            }
-                        },
-                    )
+                            },
+                        )
+                    } else {
+                        emptyList()
+                    }
 
                 nip95jobs.joinAll()
                 videoJobs.joinAll()