diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 58275705e..dd112d042 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -357,6 +357,9 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
                 inMoreSection = true;
                 continue;
             }
+            if (labelsMap.get(enabledScreen) == null) {
+                continue;
+            }
 
             final XiaomiProto.DisplayItem.Builder displayItem = XiaomiProto.DisplayItem.newBuilder()
                     .setCode(enabledScreen)