diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
index f13aa8abc..e14ddd543 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
@@ -96,10 +96,10 @@ fun Context.scheduleEventIn(notifTS: Long, event: Event) {
     val pendingIntent = getNotificationIntent(applicationContext, event)
     val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
 
-    if (isKitkatPlus()) {
-        alarmManager.setExact(AlarmManager.RTC_WAKEUP, notifTS, pendingIntent)
-    } else {
-        alarmManager.set(AlarmManager.RTC_WAKEUP, notifTS, pendingIntent)
+    when {
+        isMarshmallowPlus() -> alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, notifTS, pendingIntent)
+        isKitkatPlus() -> alarmManager.setExact(AlarmManager.RTC_WAKEUP, notifTS, pendingIntent)
+        else -> alarmManager.set(AlarmManager.RTC_WAKEUP, notifTS, pendingIntent)
     }
 }