diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt
index f5fc91c31..69db057c2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt
@@ -142,7 +142,7 @@ class MediaSelectionRepository(context: Context) {
   }
 
   fun isLocalSelfSend(recipient: Recipient?, isSms: Boolean): Boolean {
-    return !MessageSender.isLocalSelfSend(context, recipient, isSms)
+    return MessageSender.isLocalSelfSend(context, recipient, isSms)
   }
 
   @WorkerThread
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt
index 554737656..07c412ed3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt
@@ -68,7 +68,12 @@ class MediaSelectionViewModel(
   init {
     val recipientId = destination.getRecipientId()
     if (recipientId != null) {
-      store.update(Recipient.live(recipientId).liveData) { r, s -> s.copy(recipient = r) }
+      store.update(Recipient.live(recipientId).liveData) { r, s ->
+        s.copy(
+          recipient = r,
+          isPreUploadEnabled = shouldPreUpload(s.isMeteredConnection, s.transportOption.isSms, r)
+        )
+      }
     }
 
     if (initialMedia.isNotEmpty()) {