diff --git a/src/com/android/messaging/receiver/DefaultSmsSubscriptionChangeReceiver.java b/src/com/android/messaging/receiver/DefaultSmsSubscriptionChangeReceiver.java
index d5153a0..627959d 100644
--- a/src/com/android/messaging/receiver/DefaultSmsSubscriptionChangeReceiver.java
+++ b/src/com/android/messaging/receiver/DefaultSmsSubscriptionChangeReceiver.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 package com.android.messaging.receiver;
 
+import static android.telephony.SubscriptionManager.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -27,6 +30,8 @@ import com.android.messaging.datamodel.ParticipantRefresh;
 public class DefaultSmsSubscriptionChangeReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-         ParticipantRefresh.refreshSelfParticipants();
+        if (ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED.equals(intent.getAction())) {
+            ParticipantRefresh.refreshSelfParticipants();
+        }
     }
 }
diff --git a/src/com/android/messaging/receiver/SmsDeliverReceiver.java b/src/com/android/messaging/receiver/SmsDeliverReceiver.java
index 6a9b66c..d0abf7e 100644
--- a/src/com/android/messaging/receiver/SmsDeliverReceiver.java
+++ b/src/com/android/messaging/receiver/SmsDeliverReceiver.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +20,7 @@ package com.android.messaging.receiver;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.provider.Telephony.Sms;
 
 /**
  * Class that receives incoming SMS messages on KLP+ Devices.
@@ -26,6 +28,8 @@ import android.content.Intent;
 public final class SmsDeliverReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(final Context context, final Intent intent) {
-        SmsReceiver.deliverSmsIntent(context, intent);
+        if (Sms.Intents.SMS_DELIVER_ACTION.equals(intent.getAction())) {
+            SmsReceiver.deliverSmsIntent(context, intent);
+        }
     }
 }