diff --git a/omniNotes/src/main/AndroidManifest.xml b/omniNotes/src/main/AndroidManifest.xml
index b7ee0999a2..4978fc0c30 100644
--- a/omniNotes/src/main/AndroidManifest.xml
+++ b/omniNotes/src/main/AndroidManifest.xml
@@ -35,6 +35,7 @@
     <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
     <uses-permission android:name="com.pushbullet.android.permission.READ_MESSAGING_EXTENSION_DATA" />
     <uses-permission android:name="com.pushbullet.android.permission.SEND_MESSAGES" />
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
     <uses-feature
         android:name="android.hardware.camera"
diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/AlarmRestoreOnRebootService.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/AlarmRestoreOnRebootService.java
index 129ba7a525..35898849e2 100644
--- a/omniNotes/src/main/java/it/feio/android/omninotes/async/AlarmRestoreOnRebootService.java
+++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/AlarmRestoreOnRebootService.java
@@ -19,6 +19,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.core.app.JobIntentService;
 import it.feio.android.omninotes.BaseActivity;
@@ -29,13 +30,20 @@
 import it.feio.android.omninotes.utils.ReminderHelper;
 import java.util.List;
 
-
+/**
+ * Verify version code and add wake lock in manifest is important to avoid crash
+ */
 public class AlarmRestoreOnRebootService extends JobIntentService {
 
   public static final int JOB_ID = 0x01;
 
   public static void enqueueWork (Context context, Intent work) {
-    enqueueWork(context, AlarmRestoreOnRebootService.class, JOB_ID, work);
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      enqueueWork(context, AlarmRestoreOnRebootService.class, JOB_ID, work);
+    } else {
+      Intent jobIntent = new Intent(context, AlarmRestoreOnRebootService.class);
+      context.startService(jobIntent);
+    }
   }
 
   @Override