diff --git a/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt
index 1767085f..526d5d0a 100644
--- a/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt
@@ -22,14 +22,14 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import com.moez.QKSMS.service.SendScheduledMessageService
+import com.moez.QKSMS.receiver.SendScheduledMessageReceiver
 import javax.inject.Inject
 
 class AlarmManagerImpl @Inject constructor(private val context: Context) : AlarmManager {
 
     override fun getScheduledMessageIntent(id: Long): PendingIntent {
-        val intent = Intent(context, SendScheduledMessageService::class.java).putExtra("id", id)
-        return PendingIntent.getService(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        val intent = Intent(context, SendScheduledMessageReceiver::class.java).putExtra("id", id)
+        return PendingIntent.getBroadcast(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
     }
 
     override fun setAlarm(date: Long, intent: PendingIntent) {
diff --git a/data/src/main/java/com/moez/QKSMS/service/SendScheduledMessageService.kt b/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt
similarity index 81%
rename from data/src/main/java/com/moez/QKSMS/service/SendScheduledMessageService.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt
index e1151e04..eac9d68e 100644
--- a/data/src/main/java/com/moez/QKSMS/service/SendScheduledMessageService.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt
@@ -16,22 +16,23 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.moez.QKSMS.service
+package com.moez.QKSMS.receiver
 
-import android.app.IntentService
+import android.content.BroadcastReceiver
+import android.content.Context
 import android.content.Intent
 import com.moez.QKSMS.interactor.SendScheduledMessage
 import com.moez.QKSMS.repository.MessageRepository
 import dagger.android.AndroidInjection
 import javax.inject.Inject
 
-class SendScheduledMessageService : IntentService(null) {
+class SendScheduledMessageReceiver : BroadcastReceiver() {
 
     @Inject lateinit var messageRepo: MessageRepository
     @Inject lateinit var sendScheduledMessage: SendScheduledMessage
 
-    override fun onHandleIntent(intent: Intent) {
-        AndroidInjection.inject(this)
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
 
         intent.getLongExtra("id", -1L).takeIf { it >= 0 }?.let { id ->
             sendScheduledMessage.buildObservable(id).blockingSubscribe()
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index e5d8f607..5e5eaa13 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -147,6 +147,7 @@
                 <action android:name="android.provider.action.EXTERNAL_PROVIDER_CHANGE" />
             </intent-filter>
         </receiver>
+        <receiver android:name=".receiver.SendScheduledMessageReceiver" />
         <receiver android:name=".feature.widget.WidgetProvider">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -187,7 +188,6 @@
                 <action android:name="android.service.chooser.ChooserTargetService" />
             </intent-filter>
         </service>
-        <service android:name=".service.SendScheduledMessageService" />
         <service android:name=".service.SendSmsService" />
 
         <meta-data
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt
index 6ee636c2..7392b44f 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt
@@ -31,12 +31,11 @@ import com.moez.QKSMS.receiver.MmsSentReceiver
 import com.moez.QKSMS.receiver.MmsUpdatedReceiver
 import com.moez.QKSMS.receiver.NightModeReceiver
 import com.moez.QKSMS.receiver.RemoteMessagingReceiver
+import com.moez.QKSMS.receiver.SendScheduledMessageReceiver
 import com.moez.QKSMS.receiver.SmsDeliveredReceiver
 import com.moez.QKSMS.receiver.SmsProviderChangedReceiver
 import com.moez.QKSMS.receiver.SmsReceiver
 import com.moez.QKSMS.receiver.SmsSentReceiver
-import com.moez.QKSMS.service.SendScheduledMessageService
-import com.moez.QKSMS.service.SendSmsService
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
@@ -87,6 +86,10 @@ abstract class BroadcastReceiverBuilderModule {
     @ContributesAndroidInjector()
     abstract fun bindRemoteMessagingReceiver(): RemoteMessagingReceiver
 
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindSendScheduledMessageReceiver(): SendScheduledMessageReceiver
+
     @ActivityScope
     @ContributesAndroidInjector()
     abstract fun bindSmsDeliveredReceiver(): SmsDeliveredReceiver
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt
index c14aa210..22012af1 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt
@@ -21,7 +21,6 @@ package com.moez.QKSMS.injection.android
 import com.moez.QKSMS.feature.backup.RestoreBackupService
 import com.moez.QKSMS.injection.scope.ActivityScope
 import com.moez.QKSMS.service.HeadlessSmsSendService
-import com.moez.QKSMS.service.SendScheduledMessageService
 import com.moez.QKSMS.service.SendSmsService
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
@@ -37,10 +36,6 @@ abstract class ServiceBuilderModule {
     @ContributesAndroidInjector()
     abstract fun bindRestoreBackupService(): RestoreBackupService
 
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindSendScheduledMessageReceiver(): SendScheduledMessageService
-
     @ActivityScope
     @ContributesAndroidInjector()
     abstract fun bindSendSmsReceiver(): SendSmsService