diff --git a/app/src/main/java/de/kuschku/quasseldroid/service/QuasseldroidNotificationManager.kt b/app/src/main/java/de/kuschku/quasseldroid/service/QuasseldroidNotificationManager.kt
index c87b1ab034f0a573d174b4031efe12770ec0284b..6ee03952e188359d9a02e1d5fae30e1cd86365b5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/service/QuasseldroidNotificationManager.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/service/QuasseldroidNotificationManager.kt
@@ -168,13 +168,18 @@ class QuasseldroidNotificationManager @Inject constructor(private val context: C
       .setColor(context.getColorCompat(R.color.colorPrimary))
       .setLights(context.getColorCompat(R.color.colorPrimary), 200, 200)
       .apply {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O && isLoud) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
           var defaults = 0
-          if (!notificationSettings.sound.isEmpty()) {
-            setSound(Uri.parse(notificationSettings.sound))
+          if (isLoud) {
+            if (!notificationSettings.sound.isEmpty()) {
+              setSound(Uri.parse(notificationSettings.sound))
+            }
+            if (notificationSettings.vibrate) {
+              defaults = defaults or NotificationCompat.DEFAULT_VIBRATE
+            }
           }
-          if (notificationSettings.vibrate) {
-            defaults = defaults or NotificationCompat.DEFAULT_VIBRATE
+          if (notificationSettings.light) {
+            defaults = defaults or NotificationCompat.DEFAULT_LIGHTS
           }
           setDefaults(defaults)
         }
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 2c21610fefd9d9652611b0d970d2bd69928dfcf5..bf95c06c94db70c6187aada04a5e3f4231d53346 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -98,13 +98,10 @@
     <PreferenceScreen
       android:key="@string/preference_notification_configure_key"
       android:title="@string/preference_notification_configure_title">
-      <intent android:action="android.settings.CHANNEL_NOTIFICATION_SETTINGS">
+      <intent android:action="android.settings.APP_NOTIFICATION_SETTINGS">
         <extra
           android:name="android.provider.extra.APP_PACKAGE"
           android:value="@string/package_name" />
-        <extra
-          android:name="android.provider.extra.CHANNEL_ID"
-          android:value="@string/notification_channel_highlight" />
       </intent>
     </PreferenceScreen>
   </PreferenceCategory>