diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
index 98ce781eb..f2e6fca86 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
@@ -332,6 +332,8 @@ public class DeviceConfig {
                     } else
                         throw new SupportedCommandsListException("Unknown tag encountered");
                 }
+                if (this.commandsLists.isEmpty())
+                    throw new SupportedCommandsListException("CommandLists is empty");
             }
         }