diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java
index aa7ea676a8..11aa14f4da 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java
+++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java
@@ -128,7 +128,7 @@ private static CharSequence getTitle(JSONObject fcmJson) {
    }
 
    private static PendingIntent getNewDismissActionPendingIntent(int requestCode, Intent intent) {
-      return PendingIntent.getBroadcast(currentContext, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+      return PendingIntent.getBroadcast(currentContext, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
    }
 
    private static Intent getNewBaseDismissIntent(int notificationId) {
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotificationOpenIntent.kt b/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotificationOpenIntent.kt
index caf6e7b71a..db6faefc37 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotificationOpenIntent.kt
+++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotificationOpenIntent.kt
@@ -59,6 +59,7 @@ class GenerateNotificationOpenIntent(
         requestCode: Int,
         oneSignalIntent: Intent,
     ): PendingIntent? {
+        val flags =  PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         val launchIntent = getIntentVisible()
             ?:
             // Even though the default app open action is disabled we still need to attach OneSignal's
@@ -71,7 +72,7 @@ class GenerateNotificationOpenIntent(
                 context,
                 requestCode,
                 oneSignalIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT
+                flags
             )
 
 
@@ -84,7 +85,7 @@ class GenerateNotificationOpenIntent(
             context,
             requestCode,
             arrayOf(launchIntent, oneSignalIntent),
-            PendingIntent.FLAG_UPDATE_CURRENT
+            flags
         )
     }
 
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSBackgroundSync.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSBackgroundSync.java
index 28534bc431..e658e80901 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSBackgroundSync.java
+++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSBackgroundSync.java
@@ -178,7 +178,7 @@ private PendingIntent syncServicePendingIntent(Context context) {
                 context,
                 getSyncTaskId(),
                 new Intent(context, getSyncServicePendingIntentClass()),
-                PendingIntent.FLAG_UPDATE_CURRENT
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE
         );
     }