diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java
index 6db42c518..2afcf899f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java
@@ -111,6 +111,7 @@ public class PushNotificationManager {
         if (this.user.getPushDevices() == null) {
             return true;
         }
+
         for(PushDevice pushDevice : this.user.getPushDevices()) {
             if(pushDevice.getRegId().equals(this.refreshedToken)) {
                 return true;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.java
index e36f9b605..b65891b20 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.java
@@ -33,7 +33,7 @@ public class ReceivedPrivateMessageLocalNotification extends HabiticaLocalNotifi
     }
 
     protected void setNotificationActions() {
-        Intent intent = new Intent(context, LocalNotificationActionReceiver.class);
+        Intent intent = new Intent(context, MainActivity.class);
         PendingIntent pendingIntent = PendingIntent.getActivity(
                 context,
                 3000,