diff --git a/app/src/main/java/com/polar/nextcloudservices/Notification/Processors/ActionsNotificationProcessor.java b/app/src/main/java/com/polar/nextcloudservices/Notification/Processors/ActionsNotificationProcessor.java
index 34c7760..2bc3b05 100644
--- a/app/src/main/java/com/polar/nextcloudservices/Notification/Processors/ActionsNotificationProcessor.java
+++ b/app/src/main/java/com/polar/nextcloudservices/Notification/Processors/ActionsNotificationProcessor.java
@@ -46,6 +46,7 @@ private static PendingIntent getCustomActionIntent(Context context,
             }
             intent.putExtra("action_link", link);
             intent.putExtra("action_method", type);
+            intent.setPackage(context.getPackageName()); // Issue 78 --> https://developer.android.com/about/versions/14/behavior-changes-14?hl=en#safer-intents
         } catch (JSONException e) {
             Log.e(TAG, "Can not get link or method from action provided by Nextcloud API");
             e.printStackTrace();
diff --git a/app/src/main/java/com/polar/nextcloudservices/Notification/Processors/basic/BasicNotificationProcessor.java b/app/src/main/java/com/polar/nextcloudservices/Notification/Processors/basic/BasicNotificationProcessor.java
index 709ef48..6cfb614 100644
--- a/app/src/main/java/com/polar/nextcloudservices/Notification/Processors/basic/BasicNotificationProcessor.java
+++ b/app/src/main/java/com/polar/nextcloudservices/Notification/Processors/basic/BasicNotificationProcessor.java
@@ -44,12 +44,13 @@ public int iconByApp(String appName) {
     }
 
 
-    @SuppressLint("UnspecifiedImmutableFlag")
+    //@SuppressLint("UnspecifiedImmutableFlag")
     private PendingIntent createNotificationDeleteIntent(Context context, int id) {
         Intent intent = new Intent();
         intent.setAction(Config.NotificationEventAction);
         intent.putExtra("notification_id", id);
         intent.putExtra("notification_event", NOTIFICATION_EVENT_DELETE);
+        intent.setPackage(context.getPackageName());
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             return PendingIntent.getBroadcast(
                     context,
diff --git a/app/src/main/java/com/polar/nextcloudservices/Notification/Processors/spreed/NextcloudTalkProcessor.java b/app/src/main/java/com/polar/nextcloudservices/Notification/Processors/spreed/NextcloudTalkProcessor.java
index 1d9e7a0..f281d76 100644
--- a/app/src/main/java/com/polar/nextcloudservices/Notification/Processors/spreed/NextcloudTalkProcessor.java
+++ b/app/src/main/java/com/polar/nextcloudservices/Notification/Processors/spreed/NextcloudTalkProcessor.java
@@ -149,6 +149,7 @@ private NotificationCompat.Builder setTalkOpenIntent(Context context,
         Log.d(TAG, "Setting up talk notification open intent");
 
         Intent intent = pm.getLaunchIntentForPackage("com.nextcloud.talk2");
+        intent.setPackage(context.getPackageName());
         PendingIntent pending_intent;
         pending_intent = PendingIntent.getActivity(context, 0, intent,
                 PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);