diff --git a/ReactNativeClient/android/app/src/main/AndroidManifest.xml b/ReactNativeClient/android/app/src/main/AndroidManifest.xml
index 582c2ee8b0..8b0032397b 100644
--- a/ReactNativeClient/android/app/src/main/AndroidManifest.xml
+++ b/ReactNativeClient/android/app/src/main/AndroidManifest.xml
@@ -48,6 +48,9 @@
 		<meta-data
 		    android:name="com.google.firebase.messaging.default_notification_icon"
 		    android:resource="@drawable/ic_stat_access_alarm" />
+		<meta-data
+		    android:name="com.google.firebase.messaging.default_notification_channel_id"
+		    android:value="@string/default_notification_channel_id"/>
 		<receiver android:name="io.invertase.firebase.notifications.RNFirebaseNotificationReceiver"/>
 			<receiver android:enabled="true" android:exported="true"  android:name="io.invertase.firebase.notifications.RNFirebaseNotificationsRebootReceiver">
 			<intent-filter>
diff --git a/ReactNativeClient/android/app/src/main/res/values/strings.xml b/ReactNativeClient/android/app/src/main/res/values/strings.xml
index 4c3fb50cb6..f89aea2b78 100644
--- a/ReactNativeClient/android/app/src/main/res/values/strings.xml
+++ b/ReactNativeClient/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">Joplin</string>
+    <string name="default_notification_channel_id">net.cozic.joplin.notification</string>
 </resources>
diff --git a/ReactNativeClient/lib/services/AlarmServiceDriver.android.js b/ReactNativeClient/lib/services/AlarmServiceDriver.android.js
index 3de7ce257e..d29a56a43c 100644
--- a/ReactNativeClient/lib/services/AlarmServiceDriver.android.js
+++ b/ReactNativeClient/lib/services/AlarmServiceDriver.android.js
@@ -2,6 +2,12 @@ import firebase from 'react-native-firebase';
 
 class AlarmServiceDriver {
 
+	constructor() {
+		this.channel_ = new firebase.notifications.Android.Channel('net.cozic.joplin.notification', 'Joplin Alarm',firebase.notifications.Android.Importance.Max)
+			.setDescription('Displays a notification for alarms associated with to-dos.');
+		firebase.notifications().android.createChannel(this.channel_);
+	}
+
 	hasPersistentNotifications() {
 		return true;
 	}
@@ -23,10 +29,10 @@ class AlarmServiceDriver {
 		firebaseNotification.setNotificationId(this.firebaseNotificationId_(notification.id));
 		firebaseNotification.setTitle(notification.title)	
 		if ('body' in notification) firebaseNotification.body = notification.body;
-		firebaseNotification.android.setChannelId('com.google.firebase.messaging.default_notification_channel_id');
+		firebaseNotification.android.setChannelId('net.cozic.joplin.notification');
 		firebaseNotification.android.setSmallIcon('ic_stat_access_alarm');
 
-		firebase.notifications().scheduleNotification(firebaseNotification, {
+		await firebase.notifications().scheduleNotification(firebaseNotification, {
 			fireDate: notification.date.getTime(),
 		});
 	}