diff --git a/android/app/src/main/java/com/keyboardcrumbs/hassclient/MessagingService.java b/android/app/src/main/java/com/keyboardcrumbs/hassclient/MessagingService.java
index 91b53ec..d6a3649 100644
--- a/android/app/src/main/java/com/keyboardcrumbs/hassclient/MessagingService.java
+++ b/android/app/src/main/java/com/keyboardcrumbs/hassclient/MessagingService.java
@@ -98,7 +98,7 @@ public class MessagingService extends FirebaseMessagingService {
                 Log.d(TAG, "Putting a tag to the action: " + nTag);
                 broadcastIntent.putExtra("tag", nTag);
                 broadcastIntent.putExtra("actionData", data.get("action" + i + "_data"));
-                PendingIntent actionIntent = PendingIntent.getBroadcast(this, i, broadcastIntent, 0);
+                PendingIntent actionIntent = PendingIntent.getBroadcast(this, i, broadcastIntent, PendingIntent.FLAG_CANCEL_CURRENT);
                 notificationBuilder.addAction(R.drawable.mini_icon, data.get("action" + i), actionIntent);
             }   
         }
diff --git a/android/app/src/main/java/com/keyboardcrumbs/hassclient/NotificationActionReceiver.java b/android/app/src/main/java/com/keyboardcrumbs/hassclient/NotificationActionReceiver.java
index 451137c..4c0ef69 100644
--- a/android/app/src/main/java/com/keyboardcrumbs/hassclient/NotificationActionReceiver.java
+++ b/android/app/src/main/java/com/keyboardcrumbs/hassclient/NotificationActionReceiver.java
@@ -21,15 +21,14 @@ public class NotificationActionReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         String rawActionData = intent.getStringExtra("actionData");
         String notificationTag = intent.getStringExtra("tag");
-        Log.d(TAG, "Has 'tag': " + intent.hasExtra("tag"));
         Log.d(TAG, "Canceling notification by tag: " + notificationTag);
+        Log.d(TAG, "action data: " + rawActionData);
         NotificationManager notificationManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
         notificationManager.cancel(notificationTag, 0);
         SharedPreferences prefs = context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE);
         String webhookId = prefs.getString("flutter.app-webhook-id", null);
         if (webhookId != null) {
             try {
-                Log.d(TAG, "Got webhook id");
                 String requestUrl = prefs.getString("flutter.hassio-res-protocol", "") +
                     "://" +
                     prefs.getString("flutter.hassio-domain", "") +