diff --git a/data/src/main/java/receiver/SmsSentReceiver.kt b/data/src/main/java/receiver/SmsSentReceiver.kt
index 7797505f..733fec75 100644
--- a/data/src/main/java/receiver/SmsSentReceiver.kt
+++ b/data/src/main/java/receiver/SmsSentReceiver.kt
@@ -26,7 +26,6 @@ import android.telephony.SmsManager
 import dagger.android.AndroidInjection
 import interactor.MarkFailed
 import interactor.MarkSent
-import timber.log.Timber
 import javax.inject.Inject
 
 class SmsSentReceiver : BroadcastReceiver() {
@@ -49,14 +48,9 @@ class SmsSentReceiver : BroadcastReceiver() {
             SmsManager.RESULT_ERROR_NO_SERVICE,
             SmsManager.RESULT_ERROR_NULL_PDU,
             SmsManager.RESULT_ERROR_RADIO_OFF -> {
-                Timber.w(SmsFailedException(resultCode, intent.getIntExtra("errorCode", -1)))
-
                 val pendingResult = goAsync()
                 markFailed.execute(MarkFailed.Params(id, resultCode)) { pendingResult.finish() }
             }
         }
     }
-}
-
-private class SmsFailedException(resultCode: Int, errorCode: Int)
-    : Exception("Message failed to send with resultCode: $resultCode and errorCode: $errorCode")
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt
index bf5140c3..3e80ef9d 100644
--- a/data/src/main/java/repository/MessageRepositoryImpl.kt
+++ b/data/src/main/java/repository/MessageRepositoryImpl.kt
@@ -413,7 +413,9 @@ class MessageRepositoryImpl @Inject constructor(
     }
 
     override fun sendSms(message: Message) {
-        val smsManager = SmsManager.getSmsManagerForSubscriptionId(message.subId)
+        val smsManager = message.subId.takeIf { it != -1 }
+                ?.let(SmsManager::getSmsManagerForSubscriptionId)
+                ?: SmsManager.getDefault()
 
         val parts = smsManager.divideMessage(if (prefs.unicode.get()) StripAccents.stripAccents(message.body) else message.body)
                 ?: arrayListOf()