diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0e14693..fe4cca4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,8 +13,8 @@
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
-
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name=".PFCircuitTrainingApplication"
@@ -129,10 +129,11 @@
             android:exported="true" />
 
         <receiver
-            android:name="org.secuso.privacyfriendlycircuittraining.receivers.OnBootCompletedBroadcastReceiver"
+            android:name="org.secuso.privacyfriendlycircuittraining.receivers.NotificationEventsReceiver"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.app.action.SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED" />
             </intent-filter>
         </receiver>
 
diff --git a/app/src/main/java/org/secuso/privacyfriendlycircuittraining/receivers/OnBootCompletedBroadcastReceiver.java b/app/src/main/java/org/secuso/privacyfriendlycircuittraining/receivers/NotificationEventsReceiver.java
similarity index 81%
rename from app/src/main/java/org/secuso/privacyfriendlycircuittraining/receivers/OnBootCompletedBroadcastReceiver.java
rename to app/src/main/java/org/secuso/privacyfriendlycircuittraining/receivers/NotificationEventsReceiver.java
index a5c3758..83cfc88 100644
--- a/app/src/main/java/org/secuso/privacyfriendlycircuittraining/receivers/OnBootCompletedBroadcastReceiver.java
+++ b/app/src/main/java/org/secuso/privacyfriendlycircuittraining/receivers/NotificationEventsReceiver.java
@@ -14,6 +14,7 @@
 
 package org.secuso.privacyfriendlycircuittraining.receivers;
 
+import android.app.AlarmManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -28,9 +29,12 @@
  * @author Alexander Karakuz
  * @version 20170812
  */
-public class OnBootCompletedBroadcastReceiver extends BroadcastReceiver {
+public class NotificationEventsReceiver extends BroadcastReceiver {
+
+    private static final String TAG = "NotificationEventsReceiver";
     @Override
     public void onReceive(Context context, Intent intent) {
+        if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction()) && AlarmManager.ACTION_SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED.equals(intent.getAction())) return;
         if(isMotivationAlertEnabled(context)){
             setMotivationAlert(context);
         }