diff --git a/app/src/main/java/eu/faircode/email/NotificationHelper.java b/app/src/main/java/eu/faircode/email/NotificationHelper.java
index e5767bc8cf..329686dc53 100644
--- a/app/src/main/java/eu/faircode/email/NotificationHelper.java
+++ b/app/src/main/java/eu/faircode/email/NotificationHelper.java
@@ -19,7 +19,6 @@ package eu.faircode.email;
     Copyright 2018-2025 by Marcel Bokhorst (M66B)
 */
 
-import static androidx.core.app.NotificationCompat.DEFAULT_LIGHTS;
 import static androidx.core.app.NotificationCompat.DEFAULT_SOUND;
 
 import android.Manifest;
@@ -819,9 +818,11 @@ class NotificationHelper {
             if (notify_summary) {
                 builder.setOnlyAlertOnce(new_messages <= 0);
 
+                if (light)
+                    setLight(builder);
                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
                     if (new_messages > 0)
-                        setLightAndSound(builder, light, sound);
+                        setSound(builder, sound);
                     else
                         builder.setSound(null);
             } else {
@@ -1015,8 +1016,10 @@ class NotificationHelper {
                         .setGroupSummary(false)
                         .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN);
 
+            if (light)
+                setLight(mbuilder);
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
-                setLightAndSound(mbuilder, light, sound);
+                setSound(mbuilder, sound);
 
             Address[] afrom = messageFrom.get(message.id);
             String from = MessageHelper.formatAddresses(afrom, email_format, false);
@@ -1380,13 +1383,13 @@ class NotificationHelper {
         return message.accountColor;
     }
 
-    private static void setLightAndSound(NotificationCompat.Builder builder, boolean light, String sound) {
-        int def = 0;
+    private static void setLight(NotificationCompat.Builder builder) {
+        builder.setLights(Color.YELLOW, 500, 500);
+        Log.i("Notify light enabled");
+    }
 
-        if (light) {
-            def |= DEFAULT_LIGHTS;
-            Log.i("Notify light enabled");
-        }
+    private static void setSound(NotificationCompat.Builder builder, String sound) {
+        int def = 0;
 
         if (!"".equals(sound)) {
             // Not silent sound
diff --git a/app/src/main/res/layout/fragment_options_notifications.xml b/app/src/main/res/layout/fragment_options_notifications.xml
index 7176f3eae1..c4c27c973a 100644
--- a/app/src/main/res/layout/fragment_options_notifications.xml
+++ b/app/src/main/res/layout/fragment_options_notifications.xml
@@ -463,7 +463,7 @@
                     android:id="@+id/grpProperties"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
-                    app:constraint_referenced_ids="swLight,btnSound" />
+                    app:constraint_referenced_ids="btnSound" />
 
                 <androidx.constraintlayout.widget.Group
                     android:id="@+id/grpScreenOn"