diff --git a/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java b/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java
index 988cccf49..bac0c0be0 100644
--- a/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java
+++ b/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java
@@ -304,10 +304,12 @@ public void sendToNotificationCentre(Bundle bundle) {
                     }
 
                     Intent actionIntent = new Intent();
-                    actionIntent.setAction(context.getPackageName() + "." + action);
+                    String packageName = context.getPackageName();
+                    actionIntent.setAction(packageName + "." + action);
                     // Add "action" for later identifying which button gets pressed.
                     bundle.putString("action", action);
                     actionIntent.putExtra("notification", bundle);
+                    actionIntent.setPackage(packageName);
                     PendingIntent pendingActionIntent = PendingIntent.getBroadcast(context, notificationID, actionIntent,
                             PendingIntent.FLAG_UPDATE_CURRENT);
                     notification.addAction(icon, action, pendingActionIntent);
diff --git a/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationRegistrationService.java b/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationRegistrationService.java
index b962f5438..8be205541 100644
--- a/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationRegistrationService.java
+++ b/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationRegistrationService.java
@@ -31,8 +31,10 @@ protected void onHandleIntent(Intent intent) {
     }
 
     private void sendRegistrationToken(String token) {
-        Intent intent = new Intent(this.getPackageName() + ".RNPushNotificationRegisteredToken");
+        String packageName = this.getPackageName();
+        Intent intent = new Intent(packageName + ".RNPushNotificationRegisteredToken");
         intent.putExtra("token", token);
+        intent.setPackage(packageName);
         sendBroadcast(intent);
     }
 }