diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb3a45a4..89d9a9b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.0
+* [Android] Add parameter [androidFullScreenIntent] that turns screen on when alarm notification is triggered.
+* Disable [stopOnNotificationOpen] by default.
+
 ## 2.0.1
 * Update README.
 * Fix example app's ring now button.
diff --git a/README.md b/README.md
index abdfad00..fbf4b8e2 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,8 @@ fadeDuration |   `double`     | Duration, in seconds, over which to fade the ala
 notificationTitle |   `String`     | The title of the notification triggered when alarm rings if app is on background.
 notificationBody | `String` | The body of the notification.
 enableNotificationOnKill |   `bool`     | Whether to show a notification when application is killed to warn the user that the alarm he set may not ring. Enabled by default.
-stopOnNotificationOpen |   `bool`     | Whether to stop the alarm when opening the received notification. Enabled by default.
+stopOnNotificationOpen |   `bool`     | Whether to stop the alarm when opening the received notification. Disabled by default.
+androidFullScreenIntent |   `bool`     | Whether to turn screen on when android alarm notification is triggered. Enabled by default.
 
 The notification shown on alarm ring can be disabled simply by ignoring the parameters `notificationTitle` and `notificationBody`. However, if you want a notification to be triggered, you will have to provide **both of them**.
 
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 8c723909..517a3eaf 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <uses-permission android:name="android.permission.VIBRATE"/>
+  <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
   <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
   <application>
     <service
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 2852b462..058e495a 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
    <uses-permission android:name="android.permission.WAKE_LOCK"/>
    <uses-permission android:name="android.permission.VIBRATE"/>
+   <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
    <application
         android:label="alarm_example"
@@ -30,6 +31,8 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:showWhenLocked="true"
+            android:turnScreenOn="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/example/lib/screens/edit_alarm.dart b/example/lib/screens/edit_alarm.dart
index 2c138e12..02053ab8 100644
--- a/example/lib/screens/edit_alarm.dart
+++ b/example/lib/screens/edit_alarm.dart
@@ -97,7 +97,6 @@ class _ExampleAlarmEditScreenState extends State<ExampleAlarmEditScreen> {
       notificationTitle: showNotification ? 'Alarm example' : null,
       notificationBody: showNotification ? 'Your alarm ($id) is ringing' : null,
       assetAudioPath: assetAudio,
-      stopOnNotificationOpen: false,
     );
     return alarmSettings;
   }
diff --git a/example/lib/screens/home.dart b/example/lib/screens/home.dart
index 1b0a1bc3..4c22572a 100644
--- a/example/lib/screens/home.dart
+++ b/example/lib/screens/home.dart
@@ -71,7 +71,7 @@ class _ExampleAlarmHomeScreenState extends State<ExampleAlarmHomeScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: const Text('alarm 2.0.1')),
+      appBar: AppBar(title: const Text('alarm 2.1.0')),
       body: SafeArea(
         child: alarms.isNotEmpty
             ? ListView.separated(
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 990ab567..e661ffb7 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.0.1"
+    version: "2.1.0"
   android_alarm_manager_plus:
     dependency: transitive
     description:
@@ -472,10 +472,10 @@ packages:
     dependency: transitive
     description:
       name: uuid
-      sha256: e03928880bdbcbf496fb415573f5ab7b1ea99b9b04f669c01104d085893c3134
+      sha256: b715b8d3858b6fa9f68f87d20d98830283628014750c2b09b6f516c1da4af2a7
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.1.0"
   vector_math:
     dependency: transitive
     description:
@@ -488,10 +488,10 @@ packages:
     dependency: transitive
     description:
       name: vibration
-      sha256: d81f665bcb201f586c295a21f3fe8f1cb6dc32c81a213a99e9c714ec8e811ce5
+      sha256: ab6d26f6694ae0cf702b6d3d1b399570f2911eddb1132c8f82eeacb71a08ece2
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   volume_controller:
     dependency: transitive
     description:
@@ -512,10 +512,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: c97defd418eef4ec88c0d1652cdce84b9f7b63dd7198e266d06ac1710d527067
+      sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.8"
+    version: "5.0.9"
   win32_registry:
     dependency: transitive
     description:
diff --git a/help/INSTALL-ANDROID.md b/help/INSTALL-ANDROID.md
index be5ef6b3..f7f1abcb 100644
--- a/help/INSTALL-ANDROID.md
+++ b/help/INSTALL-ANDROID.md
@@ -20,11 +20,12 @@ Then, add the following to your `AndroidManifest.xml` within the `<manifest></ma
 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 <uses-permission android:name="android.permission.WAKE_LOCK"/>
 <uses-permission android:name="android.permission.VIBRATE"/>
+<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
 <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
 ```
 
 ## Step 3
-Finally, within the `<application></application>` tags, add:
+Now, within the `<application></application>` tags, add:
 
 ```xml
 <service
@@ -43,3 +44,11 @@ Finally, within the `<application></application>` tags, add:
     </intent-filter>
 </receiver>
 ```
+
+Finally, if you want your notifications to show in full screen even when the device is locked, add these attributes in `<activity>`:
+
+```xml
+<activity
+    android:showWhenLocked="true"
+    android:turnScreenOn="true">
+```
\ No newline at end of file
diff --git a/lib/alarm.dart b/lib/alarm.dart
index 3848b1e0..7806041a 100644
--- a/lib/alarm.dart
+++ b/lib/alarm.dart
@@ -93,6 +93,7 @@ class Alarm {
           dateTime: alarmSettings.dateTime,
           title: alarmSettings.notificationTitle!,
           body: alarmSettings.notificationBody!,
+          fullScreenIntent: alarmSettings.androidFullScreenIntent,
         );
       }
     }
diff --git a/lib/model/alarm_settings.dart b/lib/model/alarm_settings.dart
index 1c30d4a2..b38df7fd 100644
--- a/lib/model/alarm_settings.dart
+++ b/lib/model/alarm_settings.dart
@@ -44,6 +44,11 @@ class AlarmSettings {
   /// Stops the alarm on opened notification.
   final bool stopOnNotificationOpen;
 
+  /// Whether to turn screen on when android alarm notification is triggered. Enabled by default.
+  ///
+  /// [notificationTitle] and [notificationBody] must not be null nor empty.
+  final bool androidFullScreenIntent;
+
   /// Returns a hash code for this `AlarmSettings` instance using Jenkins hash function.
   @override
   int get hashCode {
@@ -81,7 +86,8 @@ class AlarmSettings {
     this.notificationTitle,
     this.notificationBody,
     this.enableNotificationOnKill = true,
-    this.stopOnNotificationOpen = true,
+    this.stopOnNotificationOpen = false,
+    this.androidFullScreenIntent = true,
   });
 
   /// Constructs an `AlarmSettings` instance from the given JSON data.
@@ -97,6 +103,7 @@ class AlarmSettings {
         notificationBody: json['notificationBody'] as String?,
         enableNotificationOnKill: json['enableNotificationOnKill'] as bool,
         stopOnNotificationOpen: json['stopOnNotificationOpen'] as bool,
+        androidFullScreenIntent: json['androidFullScreenIntent'] as bool,
       );
 
   /// Creates a copy of `AlarmSettings` but with the given fields replaced with
@@ -113,6 +120,7 @@ class AlarmSettings {
     String? notificationBody,
     bool? enableNotificationOnKill,
     bool? stopOnNotificationOpen,
+    bool? androidFullScreenIntent,
   }) {
     return AlarmSettings(
       id: id ?? this.id,
@@ -128,6 +136,8 @@ class AlarmSettings {
           enableNotificationOnKill ?? this.enableNotificationOnKill,
       stopOnNotificationOpen:
           stopOnNotificationOpen ?? this.stopOnNotificationOpen,
+      androidFullScreenIntent:
+          androidFullScreenIntent ?? this.androidFullScreenIntent,
     );
   }
 
@@ -144,6 +154,7 @@ class AlarmSettings {
         'notificationBody': notificationBody,
         'enableNotificationOnKill': enableNotificationOnKill,
         'stopOnNotificationOpen': stopOnNotificationOpen,
+        'androidFullScreenIntent': androidFullScreenIntent,
       };
 
   /// Returns all the properties of `AlarmSettings` for debug purposes.
@@ -171,5 +182,6 @@ class AlarmSettings {
           notificationTitle == other.notificationTitle &&
           notificationBody == other.notificationBody &&
           enableNotificationOnKill == other.enableNotificationOnKill &&
-          stopOnNotificationOpen == other.stopOnNotificationOpen;
+          stopOnNotificationOpen == other.stopOnNotificationOpen &&
+          androidFullScreenIntent == other.androidFullScreenIntent;
 }
diff --git a/lib/service/notification.dart b/lib/service/notification.dart
index 582440db..f2b15215 100644
--- a/lib/service/notification.dart
+++ b/lib/service/notification.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:alarm/alarm.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
@@ -40,7 +42,8 @@ class AlarmNotification {
 
   // Callback to stop the alarm when the notification is opened.
   static onSelectNotification(NotificationResponse notificationResponse) async {
-    await stopAlarm(notificationResponse.id);
+    if (notificationResponse.id == null) return;
+    await stopAlarm(notificationResponse.id!);
   }
 
   // Callback to stop the alarm when the notification is opened for iOS versions older than 10.
@@ -49,13 +52,13 @@ class AlarmNotification {
     String? _,
     String? __,
     String? ___,
-  ) async =>
-      await stopAlarm(id);
+  ) async {
+    if (id != null) await stopAlarm(id);
+  }
 
   /// Stops the alarm.
-  static Future<void> stopAlarm(int? id) async {
-    if (id != null &&
-        Alarm.getAlarm(id)?.stopOnNotificationOpen != null &&
+  static Future<void> stopAlarm(int id) async {
+    if (Alarm.getAlarm(id)?.stopOnNotificationOpen != null &&
         Alarm.getAlarm(id)!.stopOnNotificationOpen) {
       await Alarm.stop(id);
     }
@@ -94,6 +97,7 @@ class AlarmNotification {
     required DateTime dateTime,
     required String title,
     required String body,
+    required bool fullScreenIntent,
   }) async {
     const iOSPlatformChannelSpecifics = DarwinNotificationDetails(
       presentAlert: true,
@@ -101,7 +105,7 @@ class AlarmNotification {
       presentSound: false,
     );
 
-    const androidPlatformChannelSpecifics = AndroidNotificationDetails(
+    final androidPlatformChannelSpecifics = AndroidNotificationDetails(
       'alarm',
       'alarm_plugin',
       channelDescription: 'Alarm plugin',
@@ -109,9 +113,10 @@ class AlarmNotification {
       priority: Priority.max,
       playSound: false,
       enableLights: true,
+      fullScreenIntent: fullScreenIntent,
     );
 
-    const platformChannelSpecifics = NotificationDetails(
+    final platformChannelSpecifics = NotificationDetails(
       android: androidPlatformChannelSpecifics,
       iOS: iOSPlatformChannelSpecifics,
     );
diff --git a/pubspec.yaml b/pubspec.yaml
index ab70ee32..bd06fff2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: alarm
 description: A simple Flutter alarm manager plugin for both iOS and Android.
-version: 2.0.1
+version: 2.1.0
 homepage: https://github.com/gdelataillade/alarm
 
 environment: